X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Frecoverpassword.php;h=38c42f41d1b056ac303f723dd324ce7391d3fd82;hb=3a246c17266d562e0510e5a332009dcfda43c1c7;hp=9be3c45806161785e6984f363c3b8341f77663d3;hpb=96e6df323bf1b0b15a50ed56f1526180bfb33093;p=quix0rs-gnu-social.git diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index 9be3c45806..38c42f41d1 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,69 @@ class RecoverpasswordAction extends Action { } function check_code() { + $code = $this->trimmed('code'); - $confirm = Confirm_address::staticGet($code); - if ($confirm && $confirm->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(); + $confirm = Confirm_address::staticGet('code', $code); + + 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); + $email = $confirm->address; + + # 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) { + common_log(LOG_WARNING, + 'Attempted redemption on recovery code ' . + 'that is ' . $touched . ' seconds old. '); + $this->client_error(_('This confirmation code is too old. ' . + 'Please start again.')); + return; + } + + # If we used an outstanding confirmation to send the email, + # it's been confirmed at this point. + + if (!$user->email) { + $orig = clone($user); + $user->email = $email; + $result = $user->updateKeys($orig); + if (!$result) { + common_log_db_error($user, 'UPDATE', __FILE__); + $this->server_error(_('Could not update user with confirmed email address.')); + return; } } + + # Success! + + $this->set_temp_user($user); + $this->show_password_form(); } function set_temp_user(&$user) { @@ -84,11 +136,13 @@ class RecoverpasswordAction extends Action { if ($msg) { common_element('div', 'error', $msg); } else { - common_element('div', 'instructions', - _t('If you\'ve forgotten or lost your' . - ' password, you can get a new one sent ' . + common_element_start('div', 'instructions'); + common_element('p', NULL, + _('If you\'ve forgotten or lost your' . + ' password, you can get a new one sent to' . ' the email address you have stored ' . ' in your account.')); + common_element_end('div'); } } @@ -97,41 +151,42 @@ 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_hidden('token', common_session_token()); + 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,32 +194,56 @@ 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)); + if (!$user) { $user = User::staticGet('nickname', common_canonical_nickname($nore)); } + # See if it's an unconfirmed email address + + if (!$user) { + $confirm_email = Confirm_address::staticGet('address', common_canonical_email($nore)); + if ($confirm_email && $confirm_email->address_type == 'email') { + $user = User::staticGet($confirm_email->user_id); + } + } + if (!$user) { - $this->show_form(_t('No such user.')); + $this->show_form(_('No user with that email address or username.')); return; } - if (!$user->email) { - $this->client_error(_t('No registered email address for that user.')); + + # Try to get an unconfirmed email address if they used a user name + + if (!$user->email && !$confirm_email) { + $confirm_email = Confirm_address::staticGet('user_id', $user->id); + if ($confirm_email && $confirm_email->address_type != 'email') { + # Skip non-email confirmations + $confirm_email = NULL; + } + } + + if (!$user->email && !$confirm_email) { + $this->client_error(_('No registered email address for that user.')); return; } + # Success! We have a valid user and a confirmed or unconfirmed email address + $confirm = new Confirm_address(); $confirm->code = common_confirmation_code(128); - $confirm->type = 'recover'; + $confirm->address_type = 'recover'; $confirm->user_id = $user->id; - $confirm->address = $user->email; + $confirm->address = (isset($user->email)) ? $user->email : $confirm_email->address; 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 +264,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, $confirm->address); 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(); @@ -197,20 +276,29 @@ class RecoverpasswordAction extends Action { function reset_password() { + # 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; + } + $user = $this->get_temp_user(); if (!$user) { - $this->client_error(_t('Unexpected password reset.')); + $this->client_error(_('Unexpected password reset.')); return; } - $password = $this->trimmed('password'); + + $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; } @@ -222,21 +310,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(); }