X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=8600d44fd3e05f82605ebbce04dd8ab6cc1d0efe;hb=4a2aebe5cfab4a4b0388f98b296eac66be6e3396;hp=d84a0b8cb9184e5846704aa4ca77f876fcd3cafb;hpb=7e38142d4aa080767617724a98c0cf60c70961d0;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index d84a0b8cb9..8600d44fd3 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -19,112 +19,141 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class LoginAction extends Action {
+class LoginAction extends Action
+{
 
-	function handle($args) {
-		parent::handle($args);
-		if (common_is_real_login()) {
-			common_user_error(_('Already logged in.'));
-		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$this->check_login();
-		} else {
-			$this->show_form();
-		}
-	}
+    function is_readonly()
+    {
+        return true;
+    }
 
-	function check_login() {
-		# XXX: form token in $_SESSION to prevent XSS
-		# XXX: login throttle
-		$nickname = $this->arg('nickname');
-		$password = $this->arg('password');
-		if (common_check_user($nickname, $password)) {
-			# success!
-			if (!common_set_user($nickname)) {
-				common_server_error(_('Error setting user.'));
-				return;
-			}
-			common_real_login(true);
-			if ($this->boolean('rememberme')) {
-				common_debug('Adding rememberme cookie for ' . $nickname);
-				common_rememberme();
-			}
-			# success!
-			$url = common_get_returnto();
-			if ($url) {
-				# We don't have to return to it again
-				common_set_returnto(NULL);
-			} else {
-				$url = common_local_url('all',
-										array('nickname' =>
-											  $nickname));
-			}
-			common_redirect($url);
-		} else {
-			$this->show_form(_('Incorrect username or password.'));
-			return;
-		}
+    function handle($args)
+    {
+        parent::handle($args);
+        if (common_is_real_login()) {
+            common_user_error(_('Already logged in.'));
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->check_login();
+        } else {
+            $this->show_form();
+        }
+    }
 
-		# success!
-		if (!common_set_user($user)) {
-			common_server_error(_('Error setting user.'));
-			return;
-		}
+    function check_login()
+    {
+        # XXX: login throttle
 
-		common_real_login(true);
+        # CSRF protection - token set in common_notice_form()
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
 
-		if ($this->boolean('rememberme')) {
-			common_debug('Adding rememberme cookie for ' . $nickname);
-			common_rememberme($user);
-		}
-		# success!
-		$url = common_get_returnto();
-		if ($url) {
-			# We don't have to return to it again
-			common_set_returnto(NULL);
-		} else {
-			$url = common_local_url('all',
-									array('nickname' =>
-										  $nickname));
-		}
-		common_redirect($url);
-	}
+        $nickname = common_canonical_nickname($this->trimmed('nickname'));
+        $password = $this->arg('password');
+        if (common_check_user($nickname, $password)) {
+            # success!
+            if (!common_set_user($nickname)) {
+                common_server_error(_('Error setting user.'));
+                return;
+            }
+            common_real_login(true);
+            if ($this->boolean('rememberme')) {
+                common_debug('Adding rememberme cookie for ' . $nickname);
+                common_rememberme();
+            }
+            # success!
+            $url = common_get_returnto();
+            if ($url) {
+                # We don't have to return to it again
+                common_set_returnto(null);
+            } else {
+                $url = common_local_url('all',
+                                        array('nickname' =>
+                                              $nickname));
+            }
+            common_redirect($url);
+        } else {
+            $this->show_form(_('Incorrect username or password.'));
+            return;
+        }
 
-	function show_form($error=NULL) {
-		common_show_header(_('Login'), NULL, $error, array($this, 'show_top'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'login',
-										   'action' => common_local_url('login')));
-		common_input('nickname', _('Nickname'));
-		common_password('password', _('Password'));
-		common_checkbox('rememberme', _('Remember me'), false,
-		                _('Automatically login in the future; ' .
-		                   'not for shared computers!'));
-		common_submit('submit', _('Login'));
-		common_element_end('form');
-		common_element_start('p');
-		common_element('a', array('href' => common_local_url('recoverpassword')),
-					   _('Lost or forgotten password?'));
-		common_element_end('p');
-		common_show_footer();
-	}
+        # success!
+        if (!common_set_user($user)) {
+            common_server_error(_('Error setting user.'));
+            return;
+        }
 
-	function get_instructions() {
-		return _('Login with your username and password. ' .
-				  'Don\'t have a username yet? ' .
-				  '[Register](%%action.register%%) a new account, or ' .
-				  'try [OpenID](%%action.openidlogin%%). ');
-	}
+        common_real_login(true);
 
-	function show_top($error=NULL) {
-		if ($error) {
-			common_element('p', 'error', $error);
-		} else {
-			$instr = $this->get_instructions();
-			$output = common_markup_to_html($instr);
-			common_element_start('div', 'instructions');
-			common_raw($output);
-			common_element_end('div');
-		}
-	}
+        if ($this->boolean('rememberme')) {
+            common_debug('Adding rememberme cookie for ' . $nickname);
+            common_rememberme($user);
+        }
+        # success!
+        $url = common_get_returnto();
+        if ($url) {
+            # We don't have to return to it again
+            common_set_returnto(null);
+        } else {
+            $url = common_local_url('all',
+                                    array('nickname' =>
+                                          $nickname));
+        }
+        common_redirect($url);
+    }
+
+    function show_form($error=null)
+    {
+        common_show_header(_('Login'), null, $error, array($this, 'show_top'));
+        common_element_start('form', array('method' => 'post',
+                                           'id' => 'login',
+                                           'action' => common_local_url('login')));
+        common_input('nickname', _('Nickname'));
+        common_password('password', _('Password'));
+        common_checkbox('rememberme', _('Remember me'), false,
+                        _('Automatically login in the future; ' .
+                           'not for shared computers!'));
+        common_submit('submit', _('Login'));
+        common_hidden('token', common_session_token());
+        common_element_end('form');
+        common_element_start('p');
+        common_element('a', array('href' => common_local_url('recoverpassword')),
+                       _('Lost or forgotten password?'));
+        common_element_end('p');
+        common_show_footer();
+    }
+
+    function get_instructions()
+    {
+        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-enter your ' .
+                     'user name and password ' .
+                     'before changing your settings.');
+        } else {
+            return _('Login with your username and password. ' .
+                     'Don\'t have a username yet? ' .
+                     '[Register](%%action.register%%) a new account, or ' .
+                     'try [OpenID](%%action.openidlogin%%). ');
+        }
+    }
+
+    function show_top($error=null)
+    {
+        if ($error) {
+            common_element('p', 'error', $error);
+        } else {
+            $instr = $this->get_instructions();
+            $output = common_markup_to_html($instr);
+            common_element_start('div', 'instructions');
+            common_raw($output);
+            common_element_end('div');
+        }
+    }
 }
-#
\ No newline at end of file