if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php');
-require_once('Auth/Yadis/Yadis.php');
class RemotesubscribeAction extends Action {
function show_form($err=NULL) {
$nickname = $this->trimmed('nickname');
+ $profile = $this->trimmed('profile_url');
common_show_header(_t('Remote subscribe'));
if ($err) {
common_element('div', 'error', $err);
}
common_element_start('form', array('id' => 'remotesubscribe', 'method' => 'POST',
'action' => common_local_url('remotesubscribe')));
- common_input('nickname', _t('User nickname'), $nickname);
- common_input('profile', _t('Profile URL'));
+ common_input('nickname', _t('User nickname'), $nickname,
+ _t('Nickname of the user you want to follow'));
+ common_input('profile_url', _t('Profile URL'), $profile,
+ _t('URL of your profile on another compatible microblogging service'));
common_submit('submit', _t('Subscribe'));
common_element_end('form');
common_show_footer();
return;
}
- $profile = $this->trimmed('profile');
+ $profile = $this->trimmed('profile_url');
if (!$profile) {
$this->show_form(_t('No such user!'));
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
$yadis = Auth_Yadis_Yadis::discover($profile, $fetcher);
- common_debug('remotesubscribe.php: XRDS discovery failure? "'.$yadis->failed.'"');
-
if (!$yadis || $yadis->failed) {
$this->show_form(_t('Not a valid profile URL (no YADIS document).'));
return;
return;
}
- common_debug('remotesubscribe.php: XRDS is "'.print_r($xrds,TRUE).'"');
-
$omb = $this->getOmb($xrds);
if (!$omb) {
# XXX: the following code could probably be refactored to eliminate dupes
- common_debug('remotesubscribe.php - looking for oauth discovery service');
-
- $oauth_services = $xrds->services(omb_service_filter(OAUTH_DISCOVERY));
+ $oauth_services = omb_get_services($xrds, OAUTH_DISCOVERY);
if (!$oauth_services) {
- common_debug('remotesubscribe.php - failed to find oauth discovery service');
return NULL;
}
$oauth_service = $oauth_services[0];
- common_debug('remotesubscribe.php - looking for oauth discovery XRD');
+ $oauth_xrd = $this->getXRD($oauth_service, $xrds);
- $xrd = $this->getXRD($oauth_service, $xrds);
-
- if (!$xrd) {
- common_debug('remotesubscribe.php - failed to find oauth discovery XRD');
+ if (!$oauth_xrd) {
return NULL;
}
- common_debug('remotesubscribe.php - adding OAuth services from XRD');
-
- if (!$this->addServices($xrd, $oauth_endpoints, $omb)) {
- common_debug('remotesubscribe.php - failed to add OAuth services');
+ if (!$this->addServices($oauth_xrd, $oauth_endpoints, $omb)) {
return NULL;
}
- common_debug('remotesubscribe.php - looking for OMB discovery service');
-
- $omb_services = $xrds->services(omb_service_filter(OMB_NAMESPACE));
+ $omb_services = omb_get_services($xrds, OMB_NAMESPACE);
if (!$omb_services) {
- common_debug('remotesubscribe.php - failed to find OMB discovery service');
return NULL;
}
$omb_service = $omb_services[0];
- common_debug('remotesubscribe.php - looking for OMB discovery XRD');
-
- $xrd = $this->getXRD($omb_service, $xrds);
+ $omb_xrd = $this->getXRD($omb_service, $xrds);
- if (!$xrd) {
- common_debug('remotesubscribe.php - failed to find OMB discovery XRD');
+ if (!$omb_xrd) {
return NULL;
}
- common_debug('remotesubscribe.php - adding OMB services from XRD');
-
- if (!$this->addServices($xrd, $omb_endpoints, $omb)) {
- common_debug('remotesubscribe.php - failed to add OMB services');
+ if (!$this->addServices($omb_xrd, $omb_endpoints, $omb)) {
return NULL;
}
# XXX: check that we got all the services we needed
foreach (array_merge($omb_endpoints, $oauth_endpoints) as $type) {
- if (!array_key_exists($type, $omb)) {
+ if (!array_key_exists($type, $omb) || !$omb[$type]) {
return NULL;
}
}
function addServices($xrd, $types, &$omb) {
foreach ($types as $type) {
- $matches = $xrd->services(omb_service_filter($type));
+ $matches = omb_get_services($xrd, $type);
if ($matches) {
- $omb[$type] = $services[0];
+ $omb[$type] = $matches[0];
} else {
# no match for type
return false;
# We re-use this tool's fetcher, since it's pretty good
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+
$result = $fetcher->post($req->get_normalized_http_url(),
$req->to_postdata());
$req->set_parameter('omb_listenee_avatar', $avatar->url);
}
- $nonce = $this->make_nonce();
-
- $req->set_parameter('oauth_callback', common_local_url('finishremotesubscribe',
- array('nonce' => $nonce)));
+ # XXX: add a nonce to prevent replay attacks
+
+ $req->set_parameter('oauth_callback', common_local_url('finishremotesubscribe'));
# XXX: test to see if endpoint accepts this signature method
# store all our info here
$omb['listenee'] = $user->nickname;
+ $omb['listener'] = omb_local_id($omb[OAUTH_ENDPOINT_REQUEST]);
$omb['token'] = $token;
$omb['secret'] = $secret;
+ # call doesn't work after bounce back so we cache; maybe serialization issue...?
+ $omb['access_token_url'] = omb_service_uri($omb[OAUTH_ENDPOINT_ACCESS]);
+ $omb['post_notice_url'] = omb_service_uri($omb[OMB_ENDPOINT_POSTNOTICE]);
+ $omb['update_profile_url'] = omb_service_uri($omb[OMB_ENDPOINT_UPDATEPROFILE]);
- $_SESSION[$nonce] = $omb;
+ $_SESSION['oauth_authorization_request'] = $omb;
# Redirect to authorization service
common_redirect($req->to_url());
return;
}
+
+ function make_nonce() {
+ return common_good_rand(16);
+ }
}
\ No newline at end of file
projects / quix0rs-gnu-social.git / blobdiff