X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fopenidlogin.php;h=1a4372d73e76722dfe5f60d30b220b6ba191b3f0;hb=1a63d7d8299259dc13c8b21700bf441123947d3a;hp=5d0537998d9c366b3471d489d37cc5e989147809;hpb=17504d018083f2a1dd2ea6a7453f0ffa5dddbc0c;p=quix0rs-gnu-social.git

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 5d0537998d..1a4372d73e 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -21,121 +21,111 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidloginAction extends Action {
-
-	function handle($args) {
-		parent::handle($args);
-		if (common_logged_in()) {
-			common_user_error(_t('Already logged in.'));
-		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$this->start_openid_login();
-		} else {
-			$this->show_form();
-		}
-	}
-
-	function show_form($error=NULL) {
-		common_show_header(_t('OpenID Login'));
-		if ($error) {
-			common_element('div', array('class' => 'error'), $error);
-		} else {
-			common_element('div', 'instructions',
-						   _t('Login with an OpenID account.'));
-		}
-		common_element_start('form', array('method' => 'POST',
-										   'id' => 'openidlogin',
-										   'action' => common_local_url('openidlogin')));
-		common_input('openid_url', _t('OpenID URL'));
-		common_submit('submit', _t('Login'));
-		common_element_end('form');
-		common_show_footer();
-	}
-
-	function start_openid_login() {
-		# XXX: form token in $_SESSION to prevent XSS
-		# XXX: login throttle
-		$openid_url = $this->trimmed('openid_url');
-		if (!common_valid_http_url($openid_url)) {
-			$this->show_form(_t('OpenID must be a valid URL.'));
-			return;
-		}
-
-		$consumer = oid_consumer();
-
-		if (!$consumer) {
-			common_server_error(_t('Cannot instantiate OpenID consumer object.'));
-			return;
-		}
-
-		common_ensure_session();
-
-		$auth_request = $consumer->begin($openid_url);
-
-		// Handle failure status return values.
-		if (!$auth_request) {
-			$this->show_form(_t('Not a valid OpenID.'));
-			return;
-		} else if (Auth_OpenID::isFailure($auth_request)) {
-			$this->show_form(_t('OpenID failure: ') . $auth_request->message);
-			return;
-		}
-
-		$sreg_request = Auth_OpenID_SRegRequest::build(// Required
-													   array(),
-													   // Optional
-													   array('nickname',
-															 'email',
-															 'fullname',
-															 'language',
-															 'timezone',
-															 'postcode',
-															 'country'));
-
-		if ($sreg_request) {
-			$auth_request->addExtension($sreg_request);
-		}
-
-		$trust_root = common_root_url();
-		$process_url = common_local_url('finishopenidlogin');
-
-		if ($auth_request->shouldSendRedirect()) {
-			$redirect_url = $auth_request->redirectURL($trust_root,
-													   $process_url);
-			if (!$redirect_url) {
-			} else if (Auth_OpenID::isFailure($redirect_url)) {
-				$this->show_form(_t('Could not redirect to server: ') . $redirect_url->message);
-				return;
-			} else {
-				common_redirect($redirect_url);
-			}
-		} else {
-			// Generate form markup and render it.
-			$form_id = 'openid_message';
-			$form_html = $auth_request->formMarkup($trust_root, $process_url,
-												   false, array('id' => $form_id));
-			
-			# XXX: This is cheap, but things choke if we don't escape ampersands
-			# in the HTML attributes
-			
-			$form_html = preg_replace('/&/', '&', $form_html);
-			
-			// Display an error if the form markup couldn't be generated;
-			// otherwise, render the HTML.
-			if (Auth_OpenID::isFailure($form_html)) {
-				$this->show_form(_t('Could not create OpenID form: ') . $form_html->message);
-			} else {
-				common_show_header(_t('OpenID Auto-Submit'));
-				common_element('p', 'instructions',
-							   _t('This form should automatically submit itself. '.
-								  'If not, click the submit button to go to your '.
-								  'OpenID provider.'));
-				common_raw($form_html);
-				common_element('script', NULL,
-							   '$(document).ready(function() { ' .
-							   '    $("#'. $form_id .'").submit(); '.
-							   '}');
-				common_show_footer();
-			}
-		}
-	}
+class OpenidloginAction extends Action
+{
+    function handle($args)
+    {
+        parent::handle($args);
+        if (common_is_real_login()) {
+            $this->clientError(_('Already logged in.'));
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $openid_url = $this->trimmed('openid_url');
+
+            # CSRF protection
+            $token = $this->trimmed('token');
+            if (!$token || $token != common_session_token()) {
+                $this->showForm(_('There was a problem with your session token. Try again, please.'), $openid_url);
+                return;
+            }
+
+            $rememberme = $this->boolean('rememberme');
+
+            common_ensure_session();
+
+            $_SESSION['openid_rememberme'] = $rememberme;
+
+            $result = oid_authenticate($openid_url,
+                                       'finishopenidlogin');
+
+            if (is_string($result)) { # error message
+                unset($_SESSION['openid_rememberme']);
+                $this->showForm($result, $openid_url);
+            }
+        } else {
+            $openid_url = oid_get_last();
+            $this->showForm(null, $openid_url);
+        }
+    }
+
+    function getInstructions()
+    {
+        if (common_logged_in() && !common_is_real_login() &&
+            common_get_returnto()) {
+            // rememberme logins have to reauthenticate before
+            // changing any profile settings (cookie-stealing protection)
+            return _('For security reasons, please re-login with your ' .
+                     '[OpenID](%%doc.openid%%) ' .
+                     'before changing your settings.');
+        } else {
+            return _('Login with an [OpenID](%%doc.openid%%) account.');
+        }
+    }
+
+    function showPageNotice()
+    {
+        if ($this->error) {
+            $this->element('div', array('class' => 'error'), $this->error);
+        } else {
+            $instr = $this->getInstructions();
+            $output = common_markup_to_html($instr);
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
+        }
+    }
+
+    function title()
+    {
+        return _('OpenID Login');
+    }
+
+    function showForm($error=null, $openid_url)
+    {
+        $this->error = $error;
+        $this->openid_url = $openid_url;
+        $this->showPage();
+    }
+
+    function showContent() {
+        $formaction = common_local_url('openidlogin');
+        $this->elementStart('form', array('method' => 'post',
+                                           'id' => 'form_openid_login',
+                                           'class' => 'form_settings',
+                                           'action' => $formaction));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('OpenID login'));
+        $this->hidden('token', common_session_token());
+
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+        $this->input('openid_url', _('OpenID URL'),
+                     $this->openid_url,
+                     _('Your OpenID URL'));
+        $this->elementEnd('li');
+        $this->elementStart('li', array('id' => 'settings_rememberme'));
+        $this->checkbox('rememberme', _('Remember me'), false,
+                        _('Automatically login in the future; ' .
+                           'not for shared computers!'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->submit('submit', _('Login'));
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+
+    function showLocalNav()
+    {
+        $nav = new LoginGroupNav($this);
+        $nav->show();
+    }
 }