X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Frecoverpassword.php;h=9c34ff3d84149ea1a28f8bdb5dddd47337fbc321;hb=16daa87a392bc503ff7c07773618893f581dc982;hp=2d38f090830094825a50cd76fdb4bc0a6a6c104e;hpb=d3679822530e351894ca1f809c97638873832a74;p=quix0rs-gnu-social.git diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index 2d38f09083..9c34ff3d84 100644 --- a/actions/recoverpassword.php +++ b/actions/recoverpassword.php @@ -19,12 +19,16 @@ if (!defined('LACONICA')) { exit(1); } +# You have 24 hours to claim your password + +define(MAX_RECOVERY_TIME, 24 * 60 * 60); + class RecoverpasswordAction extends Action { function handle($args) { parent::handle($args); if (common_logged_in()) { - $this->client_error(_t('You are already logged in!')); + $this->client_error(_('You are already logged in!')); return; } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('recover')) { @@ -32,7 +36,7 @@ class RecoverpasswordAction extends Action { } else if ($this->arg('reset')) { $this->reset_password(); } else { - $this->client_error(_t('Unexpected form.')); + $this->client_error(_('Unexpected form submission.')); } } else { if ($this->trimmed('code')) { @@ -44,21 +48,51 @@ class RecoverpasswordAction extends Action { } function check_code() { + $code = $this->trimmed('code'); $confirm = Confirm_address::staticGet($code); - if ($confirm && $confirm->address_type == 'recover') { - $user = User::staticGet($confirm->user_id); - if ($user) { - $result = $confirm->delete(); - if (!$result) { - common_log_db_error($confirm, 'DELETE', __FILE__); - common_server_error(_t('Error with confirmation code.')); - return; - } - $this->set_temp_user($user); - $this->show_password_form(); - } + + if (!$confirm) { + $this->client_error(_('No such recovery code.')); + return; + } + if ($confirm->address_type != 'recover') { + $this->client_error(_('Not a recovery code.')); + return; + } + + $user = User::staticGet($confirm->user_id); + + if (!$user) { + $this->server_error(_('Recovery code for unknown user.')); + return; } + + $touched = strtotime($confirm->modified); + + # Burn this code + + $result = $confirm->delete(); + + if (!$result) { + common_log_db_error($confirm, 'DELETE', __FILE__); + common_server_error(_('Error with confirmation code.')); + return; + } + + # These should be reaped, but for now we just check mod time + # Note: it's still deleted; let's avoid a second attempt! + + if ((time() - $touched) > MAX_RECOVERY_TIME) { + $this->client_error(_('This confirmation code is too old. ' . + 'Please start again.')); + return; + } + + # Success! + + $this->set_temp_user($user); + $this->show_password_form(); } function set_temp_user(&$user) { @@ -85,7 +119,7 @@ class RecoverpasswordAction extends Action { common_element('div', 'error', $msg); } else { common_element('div', 'instructions', - _t('If you\'ve forgotten or lost your' . + _('If you\'ve forgotten or lost your' . ' password, you can get a new one sent ' . ' the email address you have stored ' . ' in your account.')); @@ -97,41 +131,41 @@ class RecoverpasswordAction extends Action { common_element('div', 'error', $msg); } else { common_element('div', 'instructions', - _t('You\ve been identified . Enter a ' . + _('You\'ve been identified. Enter a ' . ' new password below. ')); } } function show_form($msg=NULL) { - common_show_header(_t('Recover password'), NULL, + common_show_header(_('Recover password'), NULL, $msg, array($this, 'show_top')); - common_element_start('form', array('method' => 'POST', + common_element_start('form', array('method' => 'post', 'id' => 'recoverpassword', 'action' => common_local_url('recoverpassword'))); - common_input('nicknameoremail', _t('Nickname or email'), + common_input('nicknameoremail', _('Nickname or email'), $this->trimmed('nicknameoremail'), - _t('Your nickname on this server, ' . + _('Your nickname on this server, ' . 'or your registered email address.')); - common_submit('recover', _t('Recover')); + common_submit('recover', _('Recover')); common_element_end('form'); common_show_footer(); } function show_password_form($msg=NULL) { - common_show_header(_t('Reset password'), NULL, + common_show_header(_('Reset password'), NULL, $msg, array($this, 'show_password_top')); - common_element_start('form', array('method' => 'POST', + common_element_start('form', array('method' => 'post', 'id' => 'recoverpassword', 'action' => common_local_url('recoverpassword'))); - common_password('newpassword', _t('New password'), - _t('6 or more characters, and don\'t forget it!')); - common_password('confirm', _t('Confirm'), - _t('Same as password above')); - common_submit('reset', _t('Reset')); + common_password('newpassword', _('New password'), + _('6 or more characters, and don\'t forget it!')); + common_password('confirm', _('Confirm'), + _('Same as password above')); + common_submit('reset', _('Reset')); common_element_end('form'); common_show_footer(); } @@ -139,7 +173,7 @@ class RecoverpasswordAction extends Action { function recover_password() { $nore = $this->trimmed('nicknameoremail'); if (!$nore) { - $this->show_form(_t('Enter a nickname or email address.')); + $this->show_form(_('Enter a nickname or email address.')); return; } $user = User::staticGet('email', common_canonical_email($nore)); @@ -148,11 +182,11 @@ class RecoverpasswordAction extends Action { } if (!$user) { - $this->show_form(_t('No such user.')); + $this->show_form(_('No such user.')); return; } if (!$user->email) { - $this->client_error(_t('No registered email address for that user.')); + $this->client_error(_('No registered email address for that user.')); return; } @@ -164,7 +198,7 @@ class RecoverpasswordAction extends Action { if (!$confirm->insert()) { common_log_db_error($confirm, 'INSERT', __FILE__); - $this->server_error(_t('Error saving address confirmation.')); + $this->server_error(_('Error saving address confirmation.')); return; } @@ -185,11 +219,11 @@ class RecoverpasswordAction extends Action { $body .= common_config('site', 'name'); $body .= "\n"; - mail_to_user($user, _t('Password recovery requested'), $body); + mail_to_user($user, _('Password recovery requested'), $body); common_show_header(_('Password recovery requested')); common_element('p', NULL, - _t('Instructions for recovering your password ' . + _('Instructions for recovering your password ' . 'have been sent to the email address registered to your ' . 'account.')); common_show_footer(); @@ -200,19 +234,19 @@ class RecoverpasswordAction extends Action { $user = $this->get_temp_user(); if (!$user) { - $this->client_error(_t('Unexpected password reset.')); + $this->client_error(_('Unexpected password reset.')); return; } - $password = $this->trimmed('newpassword'); + $newpassword = $this->trimmed('newpassword'); $confirm = $this->trimmed('confirm'); - if (!$password || strlen($password) < 6) { - $this->show_password_form(_t('Password must be 6 chars or more.')); + if (!$newpassword || strlen($newpassword) < 6) { + $this->show_password_form(_('Password must be 6 chars or more.')); return; } - if ($password != $confirm) { - $this->show_password_form(_t('Password and confirmation do not match.')); + if ($newpassword != $confirm) { + $this->show_password_form(_('Password and confirmation do not match.')); return; } @@ -224,21 +258,21 @@ class RecoverpasswordAction extends Action { if (!$user->update($original)) { common_log_db_error($user, 'UPDATE', __FILE__); - common_server_error(_t('Can\'t save new password.')); + common_server_error(_('Can\'t save new password.')); return; } $this->clear_temp_user(); if (!common_set_user($user->nickname)) { - common_server_error(_t('Error setting user.')); + common_server_error(_('Error setting user.')); return; } common_real_login(true); common_show_header(_('Password saved.')); - common_element('p', NULL, _t('New password successfully saved. ' . + common_element('p', NULL, _('New password successfully saved. ' . 'You are now logged in.')); common_show_footer(); }