X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fremotesubscribe.php;h=b676484cd8fde58626d38fe968b098567b894482;hb=d0559fdf4dafcaf8446b437f4af089c944a23d09;hp=68f5f0fc3473ab5200c84af80ff58a8904a6a582;hpb=90b4873a00b0d8b4249a323fc84a7460024f491b;p=quix0rs-gnu-social.git diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 68f5f0fc34..b676484cd8 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -20,12 +20,11 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); -require_once('Auth/Yadis/Yadis.php'); class RemotesubscribeAction extends Action { - + function handle($args) { - + parent::handle($args); if (common_logged_in()) { @@ -41,62 +40,75 @@ 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('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(); } - + function remote_subscription() { $user = $this->get_user(); - + if (!$user) { $this->show_form(_t('No such user!')); return; } - - $profile = $this->trimmed('profile'); - + + $profile = $this->trimmed('profile_url'); + if (!$profile) { $this->show_form(_t('No such user!')); return; } - + if (!Validate::uri($profile, array('allowed_schemes' => array('http', 'https')))) { $this->show_form(_t('Invalid profile URL (bad format)')); return; } - + $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); $yadis = Auth_Yadis_Yadis::discover($profile, $fetcher); - - if (!$yadis) { + + if (!$yadis || $yadis->failed) { $this->show_form(_t('Not a valid profile URL (no YADIS document).')); return; } - - $omb = $this->getOmb($yadis); - + + $xrds =& Auth_Yadis_XRDS::parseXRDS($yadis->response_text); + + if (!$xrds) { + $this->show_form(_t('Not a valid profile URL (no XRDS defined).')); + return; + } + + $omb = $this->getOmb($xrds); + if (!$omb) { $this->show_form(_t('Not a valid profile URL (incorrect services).')); return; } - + list($token, $secret) = $this->request_token($omb); - + if (!$token || !$secret) { $this->show_form(_t('Couldn\'t get a request token.')); return; } - + $this->request_authorization($user, $omb, $token, $secret); } - + function get_user() { $user = NULL; $nickname = $this->trimmed('nickname'); @@ -106,101 +118,166 @@ class RemotesubscribeAction extends Action { return $user; } - function getOmb($yadis) { - static $endpoints = array(OMB_ENDPOINT_UPDATEPROFILE, OMB_ENDPOINT_POSTNOTICE, - OAUTH_ENDPOINT_REQUEST, OAUTH_ENDPOINT_AUTHORIZE, - OAUTH_ENDPOINT_ACCESS); + function getOmb($xrds) { + + static $omb_endpoints = array(OMB_ENDPOINT_UPDATEPROFILE, OMB_ENDPOINT_POSTNOTICE); + static $oauth_endpoints = array(OAUTH_ENDPOINT_REQUEST, OAUTH_ENDPOINT_AUTHORIZE, + OAUTH_ENDPOINT_ACCESS); $omb = array(); - $services = $yadis->services(); # ordered by priority - foreach ($services as $service) { - $types = $service->matchTypes($endpoints); - foreach ($types as $type) { - # We take the first one, since it's the highest priority - if (!array_key_exists($type, $omb)) { - # URIs is an array, priority-ordered - $omb[$type] = $service->getURIs(); - # Special handling for request - if ($type == OAUTH_ENDPOINT_REQUEST) { - $nodes = $service->getElements('LocalID'); - if (!$nodes) { - # error - return NULL; - } - $omb['listener'] = $service->parser->content($nodes[0]); - } - } - } + + # XXX: the following code could probably be refactored to eliminate dupes + + $oauth_services = omb_get_services($xrds, OAUTH_DISCOVERY); + + if (!$oauth_services) { + return NULL; + } + + $oauth_service = $oauth_services[0]; + + $oauth_xrd = $this->getXRD($oauth_service, $xrds); + + if (!$oauth_xrd) { + return NULL; } - foreach ($endpoints as $ep) { - if (!array_key_exists($ep, $omb)) { + + if (!$this->addServices($oauth_xrd, $oauth_endpoints, $omb)) { + return NULL; + } + + $omb_services = omb_get_services($xrds, OMB_NAMESPACE); + + if (!$omb_services) { + return NULL; + } + + $omb_service = $omb_services[0]; + + $omb_xrd = $this->getXRD($omb_service, $xrds); + + if (!$omb_xrd) { + return NULL; + } + + 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) || !$omb[$type]) { return NULL; } } - if (!array_key_exists('listener', $omb)) { + + if (!omb_local_id($omb[OAUTH_ENDPOINT_REQUEST])) { return NULL; } + return $omb; } - + + function getXRD($main_service, $main_xrds) { + $uri = omb_service_uri($main_service); + if (strpos($uri, "#") !== 0) { + # FIXME: more rigorous handling of external service definitions + return NULL; + } + $id = substr($uri, 1); + $nodes = $main_xrds->allXrdNodes; + $parser = $main_xrds->parser; + foreach ($nodes as $node) { + $attrs = $parser->attributes($node); + if (array_key_exists('xml:id', $attrs) && + $attrs['xml:id'] == $id) { + # XXX: trick the constructor into thinking this is the only node + $bogus_nodes = array($node); + return new Auth_Yadis_XRDS($parser, $bogus_nodes); + } + } + return NULL; + } + + function addServices($xrd, $types, &$omb) { + foreach ($types as $type) { + $matches = omb_get_services($xrd, $type); + if ($matches) { + $omb[$type] = $matches[0]; + } else { + # no match for type + return false; + } + } + return true; + } + function request_token($omb) { $con = omb_oauth_consumer(); - $url = $omb[OAUTH_ENDPOINT_REQUEST][0]; - + $url = omb_service_uri($omb[OAUTH_ENDPOINT_REQUEST]); + # XXX: Is this the right thing to do? Strip off GET params and make them # POST params? Seems wrong to me. - + $parsed = parse_url($url); $params = array(); parse_str($parsed['query'], $params); $req = OAuthRequest::from_consumer_and_token($con, NULL, "POST", $url, $params); - - $req->set_parameter('omb_listener', $omb['listener']); + + $listener = omb_local_id($omb[OAUTH_ENDPOINT_REQUEST]); + + if (!$listener) { + return NULL; + } + + $req->set_parameter('omb_listener', $listener); $req->set_parameter('omb_version', OMB_VERSION_01); - + # XXX: test to see if endpoint accepts this signature method $req->sign_request(omb_hmac_sha1(), $con, NULL); - + # 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()); - + if ($result->status != 200) { return NULL; } parse_str($result->body, $return); - + return array($return['oauth_token'], $return['oauth_token_secret']); } - + function request_authorization($user, $omb, $token, $secret) { global $config; # for license URL - + $con = omb_oauth_consumer(); $tok = new OAuthToken($token, $secret); - - $url = $omb[OAUTH_ENDPOINT_AUTHORIZE][0]; - + + $url = omb_service_uri($omb[OAUTH_ENDPOINT_AUTHORIZE]); + # XXX: Is this the right thing to do? Strip off GET params and make them # POST params? Seems wrong to me. - + $parsed = parse_url($url); $params = array(); parse_str($parsed['query'], $params); $req = OAuthRequest::from_consumer_and_token($con, $tok, 'GET', $url, $params); - + # We send over a ton of information. This lets the other # server store info about our user, and it lets the current # user decide if they really want to authorize the subscription. - + $req->set_parameter('omb_version', OMB_VERSION_01); - $req->set_parameter('omb_listener', $omb['listener']); + $req->set_parameter('omb_listener', omb_local_id($omb[OAUTH_ENDPOINT_REQUEST])); $req->set_parameter('omb_listenee', $user->uri); $req->set_parameter('omb_listenee_profile', common_profile_url($user->nickname)); $req->set_parameter('omb_listenee_nickname', $user->nickname); @@ -223,26 +300,34 @@ class RemotesubscribeAction extends Action { $req->set_parameter('omb_listenee_avatar', $avatar->url); } - $nonce = $this->make_nonce(); + # XXX: add a nonce to prevent replay attacks - $req->set_parameter('oauth_callback', common_local_url('finishremotesubscribe', - array('nonce' => $nonce))); - + $req->set_parameter('oauth_callback', common_local_url('finishremotesubscribe')); + # XXX: test to see if endpoint accepts this signature method $req->sign_request(omb_hmac_sha1(), $con, $tok); - + # store all our info here $omb['listenee'] = $user->nickname; + $omb['listener'] = omb_local_id($omb[OAUTH_ENDPOINT_REQUEST]); $omb['token'] = $token; $omb['secret'] = $secret; - - $_SESSION[$nonce] = $omb; - + # 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['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