Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1564996 by greggles: Added Make one-time login link watchdog more useful for auditing.

merge-requests/26/head
David Rothstein 2013-03-30 15:40:35 -04:00
parent e66de8b026
commit bbf013472b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/user/user.pages.inc
View File

@ -128,12 +128,12 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
// First stage is a confirmation form, then login // First stage is a confirmation form, then login
if ($action == 'login') { if ($action == 'login') {
watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
// Set the new user. // Set the new user.
$user = $account; $user = $account;
// user_login_finalize() also updates the login timestamp of the // user_login_finalize() also updates the login timestamp of the
// user, which invalidates further use of the one-time login link. // user, which invalidates further use of the one-time login link.
user_login_finalize(); user_login_finalize();
watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.')); drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
// Let the user's password be changed without the current password check. // Let the user's password be changed without the current password check.
$token = drupal_hash_base64(drupal_random_bytes(55)); $token = drupal_hash_base64(drupal_random_bytes(55));