X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fremotesubscribe.php;h=0adcc08481a30038f6d2c6ec139bce3350e22776;hb=facba2566b7695a84cb8bd6b40e9f9b842db6776;hp=c61109d6a254acb3c2724c076ab9a7b8a4aad794;hpb=0f374fb944438644b4e1059fc84995615e92e870;p=quix0rs-gnu-social.git

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index c61109d6a2..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');
-
-		$xrd = $this->getXRD($oauth_service, $xrds);
+		$oauth_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');
+		$omb_xrd = $this->getXRD($omb_service, $xrds);
 
-		$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;
 		}
 
@@ -187,13 +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;
 			}
 		}
 
 		if (!omb_local_id($omb[OAUTH_ENDPOINT_REQUEST])) {
-			common_debug('remotesubscribe.php - request token service has no LocalID.');
 			return NULL;
 		}
 
@@ -223,7 +244,7 @@ class RemotesubscribeAction extends Action {
 
 	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] = $matches[0];
 			} else {
@@ -264,6 +285,7 @@ class RemotesubscribeAction extends Action {
 		# 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());
 
@@ -303,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);
 		}
@@ -321,10 +350,9 @@ 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
 
@@ -333,14 +361,25 @@ 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]);
 
-		$_SESSION[$nonce] = $omb;
+		common_ensure_session();
+		
+		$_SESSION['oauth_authorization_request'] = $omb;
 
 		# Redirect to authorization service
 
 		common_redirect($req->to_url());
 		return;
 	}
-}
\ No newline at end of file
+
+	function make_nonce() {
+		return common_good_rand(16);
+	}
+}