Ticket #32429: 32429.2.diff

src/wp-includes/user.php

@@ -2268 +2268 @@
                 $wp_hasher = new PasswordHash( 8, true );
         }
 
-        if ( $wp_hasher->CheckPassword( $key, $row->user_activation_key ) )
+        list( $pass_key, $pass_exp ) = explode( ':', $row->user_activation_key );
+
+        $expire_time = apply_filters( 'time_to_expire_password_keys', '24 hours' );     
+
+        if( time() > strtotime( $expire_time, $pass_exp ) )
+                return new WP_Error( 'expired_key', __( 'Your password reset token has expired.' ) );
+
+        if ( $wp_hasher->CheckPassword( $key, $pass_key ) )
                 return get_userdata( $row->ID );
 
         if ( $key === $row->user_activation_key ) {

src/wp-login.php

@@ -357 +357 @@
                 require_once ABSPATH . WPINC . '/class-phpass.php';
                 $wp_hasher = new PasswordHash( 8, true );
         }
-        $hashed = $wp_hasher->HashPassword( $key );
+        $time = time();
+        $hashed = $wp_hasher->HashPassword( $key ) . ':' . $time;
         $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) );
 
         $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n";
@@ -365 +366 @@
         $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
         $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n";
         $message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
-        $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
+        $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key:$time&login=" . rawurlencode($user_login), 'login') . ">\r\n";
 
         if ( is_multisite() )
                 $blogname = $GLOBALS['current_site']->site_name;
@@ -525 +526 @@
                 if ( 'invalidkey' == $_GET['error'] )
                         $errors->add( 'invalidkey', __( 'Sorry, that key does not appear to be valid.' ) );
                 elseif ( 'expiredkey' == $_GET['error'] )
-                        $errors->add( 'expiredkey', __( 'Sorry, that key has expired. Please try again.' ) );
+                        $errors->add( 'expiredkey', __( 'Sorry, your password reset link has expired. Please request a new link below.' ) );
+                
         }
 
         $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
@@ -588 +590 @@
         list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
         $rp_cookie = 'wp-resetpass-' . COOKIEHASH;
         if ( isset( $_GET['key'] ) ) {
-                $value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
+                list( $key, $exp ) = explode( ':', wp_unslash( $_GET['key'] ) );
+                $value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), $key );
                 setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
                 wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
                 exit;