X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fremotesubscribe.php;h=0adcc08481a30038f6d2c6ec139bce3350e22776;hb=c3f2d195f934c4deff91d30640ec703cb576e55d;hp=16c991fe89195ec57b44623261e73902a6f63e5f;hpb=a14833284b3293d1431e1712211d0743112ce8c6;p=quix0rs-gnu-social.git diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 16c991fe89..0adcc08481 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -20,7 +20,6 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); -require_once('Auth/Yadis/Yadis.php'); class RemotesubscribeAction extends Action { @@ -29,28 +28,60 @@ class RemotesubscribeAction extends Action { parent::handle($args); if (common_logged_in()) { - common_user_error(_t('You can use the local subscription!')); + common_user_error(_('You can use the local subscription!')); return; } if ($_SERVER['REQUEST_METHOD'] == 'POST') { + + # CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->show_form(_('There was a problem with your session token. Try again, please.')); + return; + } + $this->remote_subscription(); } else { $this->show_form(); } } - function show_form($err=NULL) { - $nickname = $this->trimmed('nickname'); - common_show_header(_t('Remote subscribe')); + function get_instructions() { + return _('To subscribe, you can [login](%%action.login%%),' . + ' or [register](%%action.register%%) a new ' . + ' account. If you already have an account ' . + ' on a [compatible microblogging site](%%doc.openmublog%%), ' . + ' enter your profile URL below.'); + } + + function show_top($err=NULL) { if ($err) { common_element('div', 'error', $err); + } else { + $instructions = $this->get_instructions(); + $output = common_markup_to_html($instructions); + common_element_start('div', 'instructions'); + common_raw($output); + common_element_end('p'); } - common_element_start('form', array('id' => 'remotesubscribe', 'method' => 'POST', + } + + function show_form($err=NULL) { + $nickname = $this->trimmed('nickname'); + $profile = $this->trimmed('profile_url'); + common_show_header(_('Remote subscribe'), NULL, $err, + array($this, 'show_top')); + # id = remotesubscribe conflicts with the + # button on profile page + common_element_start('form', array('id' => 'remsub', 'method' => 'post', 'action' => common_local_url('remotesubscribe'))); - common_input('nickname', _t('User nickname'), $nickname); - common_input('profile', _t('Profile URL')); - common_submit('submit', _t('Subscribe')); + common_hidden('token', common_session_token()); + common_input('nickname', _('User nickname'), $nickname, + _('Nickname of the user you want to follow')); + common_input('profile_url', _('Profile URL'), $profile, + _('URL of your profile on another compatible microblogging service')); + common_submit('submit', _('Subscribe')); common_element_end('form'); common_show_footer(); } @@ -59,52 +90,62 @@ class RemotesubscribeAction extends Action { $user = $this->get_user(); if (!$user) { - $this->show_form(_t('No such user!')); + $this->show_form(_('No such user.')); return; } - $profile = $this->trimmed('profile'); + $profile = $this->trimmed('profile_url'); if (!$profile) { - $this->show_form(_t('No such user!')); + $this->show_form(_('No such user.')); return; } if (!Validate::uri($profile, array('allowed_schemes' => array('http', 'https')))) { - $this->show_form(_t('Invalid profile URL (bad format)')); + $this->show_form(_('Invalid profile URL (bad format)')); return; } $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).')); + $this->show_form(_('Not a valid profile URL (no YADIS document).')); return; } - $xrds =& Auth_Yadis_XRDS::parseXRDS($yadis->response_text); + # XXX: a little liberal for sites that accidentally put whitespace before the xml declaration + + $xrds =& Auth_Yadis_XRDS::parseXRDS(trim($yadis->response_text)); if (!$xrds) { - $this->show_form(_t('Not a valid profile URL (no XRDS defined).')); + $this->show_form(_('Not a valid profile URL (no XRDS defined).')); return; } - common_debug('remotesubscribe.php: XRDS is "'.print_r($xrds,TRUE).'"'); - $omb = $this->getOmb($xrds); if (!$omb) { - $this->show_form(_t('Not a valid profile URL (incorrect services).')); + $this->show_form(_('Not a valid profile URL (incorrect services).')); + return; + } + + if (omb_service_uri($omb[OAUTH_ENDPOINT_REQUEST]) == + common_local_url('requesttoken')) + { + $this->show_form(_('That\'s a local profile! Login to subscribe.')); return; } + if (User::staticGet('uri', omb_local_id($omb[OAUTH_ENDPOINT_REQUEST]))) { + $this->show_form(_('That\'s a local profile! Login to subscribe.')); + return; + } + list($token, $secret) = $this->request_token($omb); if (!$token || !$secret) { - $this->show_form(_t('Couldn\'t get a request token.')); + $this->show_form(_('Couldn\'t get a request token.')); return; } @@ -129,57 +170,39 @@ class RemotesubscribeAction extends Action { # 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); if (!$oauth_xrd) { - common_debug('remotesubscribe.php - failed to find oauth discovery XRD'); return NULL; } - common_debug('remotesubscribe.php - adding OAuth services from XRD'); - if (!$this->addServices($oauth_xrd, $oauth_endpoints, $omb)) { - common_debug('remotesubscribe.php - failed to add OAuth services'); 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'); - $omb_xrd = $this->getXRD($omb_service, $xrds); if (!$omb_xrd) { - common_debug('remotesubscribe.php - failed to find OMB discovery XRD'); return NULL; } - common_debug('remotesubscribe.php - adding OMB services from XRD'); - if (!$this->addServices($omb_xrd, $omb_endpoints, $omb)) { - common_debug('remotesubscribe.php - failed to add OMB services'); return NULL; } @@ -187,14 +210,11 @@ class RemotesubscribeAction extends Action { foreach (array_merge($omb_endpoints, $oauth_endpoints) as $type) { if (!array_key_exists($type, $omb) || !$omb[$type]) { - common_debug('remotesubscribe.php - could not find type "'.$type.'"'); return NULL; } - common_debug('remotesubscribe.php - key ="'.$type.'" and URI ="'.omb_service_uri($omb[$type]).'"'); } if (!omb_local_id($omb[OAUTH_ENDPOINT_REQUEST])) { - common_debug('remotesubscribe.php - request token service has no LocalID.'); return NULL; } @@ -224,12 +244,8 @@ class RemotesubscribeAction extends Action { function addServices($xrd, $types, &$omb) { foreach ($types as $type) { - $matches = $xrd->services(omb_service_filter($type)); - common_debug('remotesubscribe.php - ' . count($matches) . ' matches for "'.$type.'"'); + $matches = omb_get_services($xrd, $type); if ($matches) { - foreach ($matches as $match) { - common_debug('remotesubscribe.php - "' . omb_service_uri($match) . '" matches "'.$type.'"'); - } $omb[$type] = $matches[0]; } else { # no match for type @@ -251,8 +267,6 @@ class RemotesubscribeAction extends Action { $params = array(); parse_str($parsed['query'], $params); - common_debug('remotesubscribe.php - building a POST message for request token call'); - $req = OAuthRequest::from_consumer_and_token($con, NULL, "POST", $url, $params); $listener = omb_local_id($omb[OAUTH_ENDPOINT_REQUEST]); @@ -261,8 +275,6 @@ class RemotesubscribeAction extends Action { return NULL; } - common_debug('remotesubscribe.php - request token listener = "' . $listener . '"'); - $req->set_parameter('omb_listener', $listener); $req->set_parameter('omb_version', OMB_VERSION_01); @@ -273,26 +285,16 @@ class RemotesubscribeAction extends Action { # We re-use this tool's fetcher, since it's pretty good $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); - - common_debug('remotesubscribe.php - request token URL = "'.$req->get_normalized_http_url().'"'); - common_debug('remotesubscribe.php - request token data = "'.$req->to_postdata().'"'); - + $result = $fetcher->post($req->get_normalized_http_url(), $req->to_postdata()); if ($result->status != 200) { - common_debug('remotesubscribe.php - request token status = "' . $result->status . '"'); - common_debug('remotesubscribe.php - request token body = "' . $result->body . '"'); return NULL; } - common_debug('remotesubscribe.php - request token body = "' . $result->body . '"'); - parse_str($result->body, $return); - common_debug('remotesubscribe.php - request token token = "' . $return['oauth_token'] . '"'); - common_debug('remotesubscribe.php - request token secret = "' . $return['oauth_token_secret'] . '"'); - return array($return['oauth_token'], $return['oauth_token_secret']); } @@ -304,8 +306,6 @@ class RemotesubscribeAction extends Action { $url = omb_service_uri($omb[OAUTH_ENDPOINT_AUTHORIZE]); - common_debug('remotesubscribe.php - user authorization URI = "' . $url . '"'); - # XXX: Is this the right thing to do? Strip off GET params and make them # POST params? Seems wrong to me. @@ -325,7 +325,14 @@ class RemotesubscribeAction extends Action { $req->set_parameter('omb_listenee_profile', common_profile_url($user->nickname)); $req->set_parameter('omb_listenee_nickname', $user->nickname); $req->set_parameter('omb_listenee_license', $config['license']['url']); + $profile = $user->getProfile(); + if (!$profile) { + common_log_db_error($user, 'SELECT', __FILE__); + $this->server_error(_('User without matching profile')); + return; + } + if ($profile->fullname) { $req->set_parameter('omb_listenee_fullname', $profile->fullname); } @@ -344,7 +351,7 @@ class RemotesubscribeAction extends Action { } # 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 @@ -354,9 +361,16 @@ class RemotesubscribeAction extends Action { # 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]); + common_ensure_session(); + $_SESSION['oauth_authorization_request'] = $omb; # Redirect to authorization service @@ -364,8 +378,8 @@ class RemotesubscribeAction extends Action { common_redirect($req->to_url()); return; } - + function make_nonce() { return common_good_rand(16); } -} \ No newline at end of file +}