generate an etag for shownotice

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index fe2ae5c1c459a3b2b72108c3f9812b55698cb54d..ccec9cf8a787818e20cb518f64b44bfd31b30336 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -21,10 +21,14 @@ if (!defined('LACONICA')) { exit(1); }
 
 class LoginAction extends Action {
 
+       function is_readonly() {
+               return true;
+       }
+
        function handle($args) {
                parent::handle($args);
-               if (common_logged_in()) {
-                       common_user_error(_t('Already logged in.'));
+               if (common_is_real_login()) {
+                       common_user_error(_('Already logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $this->check_login();
                } else {
@@ -33,18 +37,26 @@ class LoginAction extends Action {
        }
 
        function check_login() {
-               # XXX: form token in $_SESSION to prevent XSS
                # XXX: login throttle
-               $nickname = $this->arg('nickname');
+
+               # 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;
+               }
+
+               $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(_t('Error setting user.'));
+                               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!
@@ -59,32 +71,82 @@ class LoginAction extends Action {
                        }
                        common_redirect($url);
                } else {
-                       $this->show_form(_t('Incorrect username or password.'));
+                       $this->show_form(_('Incorrect username or password.'));
+                       return;
                }
+
+               # success!
+               if (!common_set_user($user)) {
+                       common_server_error(_('Error setting user.'));
+                       return;
+               }
+
+               common_real_login(true);
+
+               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(_t('Login'), NULL, $error, array($this, 'show_top'));
-               common_element_start('form', array('method' => 'POST',
+               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', _t('Nickname'));
-               common_password('password', _t('Password'));
-               common_checkbox('rememberme', _t('Remember me'),
-                               _t('Automatically login in the future; ' . 
+               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', _t('Login'));
+               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 {
-                       common_element('p', 'instructions', 
-                                                  _t('Login with your username and password. ' .
-                                                         'Don\'t have a username yet? Choose register above. '));
+                       $instr = $this->get_instructions();
+                       $output = common_markup_to_html($instr);
+                       common_element_start('div', 'instructions');
+                       common_raw($output);
+                       common_element_end('div');
                }
        }
 }