Skip to content

Site Health: Send only WordPress cookies with the REST API test #12952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itzmekhokan wants to merge 1 commit into
base: trunk
Choose a base branch
from
+58 −1
Open

Site Health: Send only WordPress cookies with the REST API test #12952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/wp-admin/includes/class-wp-site-health.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,6 +2187,7 @@ public function get_test_http_requests() {
* This is required for the new block editor to work, so we explicitly test for this.
*
* @since 5.2.0
* @since 7.1.0 Only WordPress' own cookies are sent with the request.
*
* @return array The test results.
*/
Expand All @@ -2206,7 +2207,16 @@ public function get_test_rest_availability() {
'test' => 'rest_availability',
);

$cookies = wp_unslash( $_COOKIE );
/*
* Only WordPress' own cookies have any bearing on this request. Forwarding the rest of
* the browser's cookie jar lets unrelated cookies fail a test that is meant to measure
* the REST API.
*/
$cookies = array_intersect_key(
wp_unslash( $_COOKIE ),
array_flip( array( AUTH_COOKIE, SECURE_AUTH_COOKIE, LOGGED_IN_COOKIE, TEST_COOKIE ) )
);

$timeout = 10; // 10 seconds.
$headers = array(
'Cache-Control' => 'no-cache',
Expand Down
47 changes: 47 additions & 0 deletions tests/phpunit/tests/admin/wpSiteHealth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,4 +707,51 @@ public function test_get_test_opcode_cache_result_by_environment() {
$this->assertStringContainsString( __( 'Enabling this cache can significantly improve the performance of your site.' ), $result['description'] );
}
}

/**
* Tests that only WordPress' own cookies are sent with the REST API test request.
*
* @ticket 65839
*
* @covers ::get_test_rest_availability()
*/
public function test_get_test_rest_availability_sends_only_wordpress_cookies() {
$original_cookie = $_COOKIE;

$_COOKIE = array(
LOGGED_IN_COOKIE => 'admin|1700000000|token|hmac',
TEST_COOKIE => 'WP Cookie check',
'_ga' => 'GA1.1.123456789.1700000000',
'wp-settings-time-1' => '1700000000',
);

$sent = null;

add_filter(
'pre_http_request',
static function ( $response, $parsed_args ) use ( &$sent ) {
$sent = $parsed_args['cookies'];

return array(
'response' => array( 'code' => 200 ),
'body' => '',
);
},
10,
2
);

$this->instance->get_test_rest_availability();

$_COOKIE = $original_cookie;

$this->assertSame(
array(
LOGGED_IN_COOKIE => 'admin|1700000000|token|hmac',
TEST_COOKIE => 'WP Cookie check',
),
$sent,
'Only WordPress\' own cookies should be sent with the REST API test request.'
);
}
}
Loading