diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php index 0de6b0cc78..61b809c542 100644 --- a/src/wp-includes/pluggable.php +++ b/src/wp-includes/pluggable.php @@ -900,6 +900,17 @@ function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = */ do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' ); + /** + * Allows preventing auth cookies from actually being sent to the client. + * + * @since 4.7.4 + * + * @param bool $send Whether to send auth cookies to the client. + */ + if ( ! apply_filters( 'send_auth_cookies', true ) ) { + return; + } + setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true); setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true); setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true); @@ -922,6 +933,17 @@ function wp_clear_auth_cookie() { */ do_action( 'clear_auth_cookie' ); + /** + * Allows preventing auth cookies from actually being sent to the client. + * + * @since 4.7.4 + * + * @param bool $send Whether to send auth cookies to the client. + */ + if ( ! apply_filters( 'send_auth_cookies', true ) ) { + return; + } + setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN ); setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN ); setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN ); diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php index 3a7c9bd98e..d9872fb541 100644 --- a/tests/phpunit/includes/functions.php +++ b/tests/phpunit/includes/functions.php @@ -164,21 +164,4 @@ function _upload_dir_https( $uploads ) { // Skip `setcookie` calls in auth_cookie functions due to warning: // Cannot modify header information - headers already sent by ... - -function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) { - $auth_cookie = null; - $expire = null; - $expiration = null; - $user_id = null; - $scheme = null; - /** This action is documented in wp-inclues/pluggable.php */ - do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme ); - $logged_in_cookie = null; - /** This action is documented in wp-inclues/pluggable.php */ - do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' ); -} - -function wp_clear_auth_cookie() { - /** This action is documented in wp-inclues/pluggable.php */ - do_action( 'clear_auth_cookie' ); -} +tests_add_filter( 'send_auth_cookies', '__return_false' );