WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Seed cookie hash key with a fragment from the password hash 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-02-03 05:03:16 +00:00
parent af5c60f83f
commit 002f1ebce3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/pluggable.php
View File

@ -488,7 +488,15 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') {
return false; return false;
} }
$key = wp_hash($username . '|' . $expiration, $scheme); $user = get_userdatabylogin($username);
if ( ! $user ) {
do_action('auth_cookie_bad_username', $cookie_elements);
return false;
}
$pass_frag = substr($user->user_pass, 8, 4);
$key = wp_hash($username . $pass_frag . '|' . $expiration, $scheme);
$hash = hash_hmac('md5', $username . '|' . $expiration, $key); $hash = hash_hmac('md5', $username . '|' . $expiration, $key);
if ( $hmac != $hash ) { if ( $hmac != $hash ) {
@ -496,12 +504,6 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') {
return false; return false;
} }
$user = get_userdatabylogin($username);
if ( ! $user ) {
do_action('auth_cookie_bad_username', $cookie_elements);
return false;
}
do_action('auth_cookie_valid', $cookie_elements, $user); do_action('auth_cookie_valid', $cookie_elements, $user);
return $user->ID; return $user->ID;
@ -524,7 +526,9 @@ if ( !function_exists('wp_generate_auth_cookie') ) :
function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') { function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') {
$user = get_userdata($user_id); $user = get_userdata($user_id);
$key = wp_hash($user->user_login . '|' . $expiration, $scheme); $pass_frag = substr($user->user_pass, 8, 4);
$key = wp_hash($user->user_login . $pass_frag . '|' . $expiration, $scheme);
$hash = hash_hmac('md5', $user->user_login . '|' . $expiration, $key); $hash = hash_hmac('md5', $user->user_login . '|' . $expiration, $key);
$cookie = $user->user_login . '|' . $expiration . '|' . $hash; $cookie = $user->user_login . '|' . $expiration . '|' . $hash;