Changeset 29396

Timestamp:

08/06/2014 06:39:30 AM (11 years ago)

Author:

nacin

Message:

Don't pass around the password reset key.

Merges [29327] and [29381] to the 3.7 branch.

props mdawaffe.
fixes #29060.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src/wp-login.php (modified) (3 diffs)

branches/3.7/src/wp-login.php

@@ -558 +558 @@
 case 'resetpass' :
 case 'rp' :
-    $user = check_password_reset_key($_GET['key'], $_GET['login']);
-
-    if ( is_wp_error($user) ) {
-        if ( $user->get_error_code() === 'expired_key' )
+    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'] ) );
+        setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+        wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
+        exit;
+    }
+
+    if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
+        list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
+        $user = check_password_reset_key( $rp_key, $rp_login );
+    } else {
+        $user = false;
+    }
+
+    if ( ! $user || is_wp_error( $user ) ) {
+        setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+        if ( $user && $user->get_error_code() === 'expired_key' )
             wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
         else
@@ -585 +600 @@
     if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
         reset_password($user, $_POST['pass1']);
+        setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
         login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
         login_footer();
@@ -596 +612 @@
 
 ?>
-<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( site_url( 'wp-login.php?action=resetpass&key=' . urlencode( $_GET['key'] ) . '&login=' . urlencode( $_GET['login'] ), 'login_post' ) ); ?>" method="post" autocomplete="off">
-    <input type="hidden" id="user_login" value="<?php echo esc_attr( $_GET['login'] ); ?>" autocomplete="off" />
+<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
+    <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
     <p>