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

Introduce a `$token` argument to `wp_set_auth_cookie()` so session tokens can be reused by custom authentication implementations. 

Props rmccue

Fixes 30247

Built from https://develop.svn.wordpress.org/trunk@32465


git-svn-id: http://core.svn.wordpress.org/trunk@32435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2015-05-09 00:28:27 +00:00
parent 2c42a665a2
commit bb02256966
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/pluggable.php
View File

@ -822,13 +822,15 @@ if ( !function_exists('wp_set_auth_cookie') ) :
* set, the cookies will be kept for 14 days or two weeks. * set, the cookies will be kept for 14 days or two weeks.
* *
* @since 2.5.0 * @since 2.5.0
* @since 4.3.0 Added the `$token` parameter.
* *
* @param int $user_id User ID * @param int $user_id User ID
* @param bool $remember Whether to remember the user * @param bool $remember Whether to remember the user
* @param mixed $secure Whether the admin cookies should only be sent over HTTPS. * @param mixed $secure Whether the admin cookies should only be sent over HTTPS.
* Default is_ssl(). * Default is_ssl().
* @param string $token Optional. User's session token to use for this cookie.
*/ */
function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
if ( $remember ) { if ( $remember ) {
/** /**
* Filter the duration of the authentication cookie expiration period. * Filter the duration of the authentication cookie expiration period.
@ -888,8 +890,10 @@ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') {
$scheme = 'auth'; $scheme = 'auth';
} }
$manager = WP_Session_Tokens::get_instance( $user_id ); if ( '' === $token ) {
$token = $manager->create( $expiration ); $manager = WP_Session_Tokens::get_instance( $user_id );
$token = $manager->create( $expiration );
}
$auth_cookie = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token ); $auth_cookie = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token );
$logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token ); $logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32464'; $wp_version = '4.3-alpha-32465';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.