Changeset 24466 for trunk

Timestamp:

06/21/2013 03:00:26 AM (13 years ago)

Author:

nacin

Message:

Validate post password hash.

Location:

trunk

Files:

• wp-includes/post-template.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-includes/post-template.php

@@ -589 +589 @@
  */
 function post_password_required( $post = null ) {
-    global $wp_hasher;
-
     $post = get_post($post);
 
@@ -599 +597 @@
         return true;
 
-    if ( empty( $wp_hasher ) ) {
-        require_once( ABSPATH . 'wp-includes/class-phpass.php');
-        // By default, use the portable hash from phpass
-        $wp_hasher = new PasswordHash(8, true);
-    }
+    require_once ABSPATH . 'wp-includes/class-phpass.php';
+    $hasher = new PasswordHash( 8, true );
 
     $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-
-    return ! $wp_hasher->CheckPassword( $post->post_password, $hash );
+    if ( 0 !== strpos( $hash, '$P$B' ) )
+        return true;
+
+    return ! $hasher->CheckPassword( $post->post_password, $hash );
 }
 

trunk/wp-login.php

@@ -408 +408 @@
 
 case 'postpass' :
-    if ( empty( $wp_hasher ) ) {
-        require_once( ABSPATH . 'wp-includes/class-phpass.php' );
-        // By default, use the portable hash from phpass
-        $wp_hasher = new PasswordHash(8, true);
-    }
+    require_once ABSPATH . 'wp-includes/class-phpass.php';
+    $hasher = new PasswordHash( 8, true );
 
     // 10 days
-    setcookie( 'wp-postpass_' . COOKIEHASH, $wp_hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), time() + 10 * DAY_IN_SECONDS, COOKIEPATH );
+    setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), time() + 10 * DAY_IN_SECONDS, COOKIEPATH );
 
     wp_safe_redirect( wp_get_referer() );