' + this.url + '
' + description + '
', + 'actions': '' + }; + + /** This filter is documented in wp-admin/includes/class-wp-site-health.php */ + AppendIssue( wp.hooks.applyFilters( 'site_status_test_result', issue ) ); + } ).always( function() { + maybeRunNextAsyncTest(); + } ); return false; } ); @@ -212,21 +242,7 @@ } if ( 0 < SiteHealth.site_status.async.length ) { - data = { - 'action': 'health-check-' + SiteHealth.site_status.async[0].test.replace( '_', '-' ), - '_wpnonce': SiteHealth.nonce.site_status - }; - - SiteHealth.site_status.async[0].completed = true; - - $.post( - ajaxurl, - data, - function( response ) { - AppendIssue( response.data ); - maybeRunNextAsyncTest(); - } - ); + maybeRunNextAsyncTest(); } else { RecalculateProgression(); } @@ -234,8 +250,7 @@ function getDirectorySizes() { var data = { - action: 'health-check-get-sizes', - _wpnonce: SiteHealth.nonce.site_status_result + _wpnonce: SiteHealth.nonce.rest_api }; var timestamp = ( new Date().getTime() ); @@ -246,12 +261,11 @@ }, 3000 ); $.post( { - type: 'POST', - url: ajaxurl, + url: SiteHealth.rest_base + 'wp-site-health/v1/get/directory-sizes', data: data, dataType: 'json' } ).done( function( response ) { - updateDirSizes( response.data || {} ); + updateDirSizes( response || {} ); } ).always( function() { var delay = ( new Date().getTime() ) - timestamp; Index: src/wp-admin/includes/class-wp-site-health.php =================================================================== --- src/wp-admin/includes/class-wp-site-health.php (revision 9568134d7b1f857322745e0694730a209fd7d2cb) +++ src/wp-admin/includes/class-wp-site-health.php (date 1593120739825) @@ -80,7 +80,9 @@ $health_check_js_variables = array( 'screen' => $screen->id, + 'rest_base' => rest_url( '/' ), 'nonce' => array( + 'rest_api' => wp_create_nonce( 'wp_rest' ), 'site_status' => wp_create_nonce( 'health-check-site-status' ), 'site_status_result' => wp_create_nonce( 'health-check-site-status-result' ), ), @@ -133,6 +135,7 @@ if ( is_string( $test['test'] ) ) { $health_check_js_variables['site_status']['async'][] = array( 'test' => $test['test'], + 'has_rest' => ( isset( $test['has_rest'] ) ? $test['has_rest'] : false ), 'completed' => false, ); } @@ -1963,6 +1966,7 @@ * experiences. * * @since 5.2.0 + * @since 5.5.0 Added support for `has_rest` and `permissions`. * * @return array The list of tests to run. */ @@ -2028,27 +2032,22 @@ ), 'async' => array( 'dotorg_communication' => array( - 'label' => __( 'Communication with WordPress.org' ), - 'test' => 'dotorg_communication', + 'label' => __( 'Communication with WordPress.org' ), + 'test' => rest_url( 'wp-site-health/v1/test/dotorg-communication' ), + 'has_rest' => true, ), 'background_updates' => array( - 'label' => __( 'Background updates' ), - 'test' => 'background_updates', + 'label' => __( 'Background updates' ), + 'test' => rest_url( 'wp-site-health/v1/test/background-updates' ), + 'has_rest' => true, ), 'loopback_requests' => array( - 'label' => __( 'Loopback request' ), - 'test' => 'loopback_requests', + 'label' => __( 'Loopback request' ), + 'test' => rest_url( 'wp-site-health/v1/test/loopback-requests' ), + 'has_rest' => true, ), ), ); - - // Conditionally include REST rules if the function for it exists. - if ( function_exists( 'rest_url' ) ) { - $tests['direct']['rest_availability'] = array( - 'label' => __( 'REST API availability' ), - 'test' => 'rest_availability', - ); - } /** * Add or modify which site status tests are run on a site. @@ -2074,9 +2073,10 @@ * Plugins and themes are encouraged to prefix test identifiers with their slug * to avoid any collisions between tests. * - * @type string $label A friendly label for your test to identify it by. - * @type mixed $test A callable to perform a direct test, or a string Ajax action to be called - * to perform an async test. + * @type string $label A friendly label for your test to identify it by. + * @type mixed $test A callable to perform a direct test, or a string AJAX action to be + * called to perform an async test. + * @type boolean $has_rest Optional. Denote if `$test` has a REST API endpoint. * } * } */ Index: src/wp-admin/includes/class-wp-site-health-auto-updates.php =================================================================== --- src/wp-admin/includes/class-wp-site-health-auto-updates.php (revision 9568134d7b1f857322745e0694730a209fd7d2cb) +++ src/wp-admin/includes/class-wp-site-health-auto-updates.php (date 1593115393868) @@ -85,46 +85,7 @@ * @return array The test results. */ public function test_wp_version_check_attached() { - if ( ! is_main_site() ) { - return; - } - - $cookies = wp_unslash( $_COOKIE ); - $timeout = 10; - $headers = array( - 'Cache-Control' => 'no-cache', - ); - /** This filter is documented in wp-includes/class-wp-http-streams.php */ - $sslverify = apply_filters( 'https_local_ssl_verify', false ); - - // Include Basic auth in loopback requests. - if ( isset( $_SERVER['PHP_AUTH_USER'] ) && isset( $_SERVER['PHP_AUTH_PW'] ) ) { - $headers['Authorization'] = 'Basic ' . base64_encode( wp_unslash( $_SERVER['PHP_AUTH_USER'] ) . ':' . wp_unslash( $_SERVER['PHP_AUTH_PW'] ) ); - } - - $url = add_query_arg( - array( - 'health-check-test-wp_version_check' => true, - ), - admin_url( 'site-health.php' ) - ); - - $test = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout', 'sslverify' ) ); - - if ( is_wp_error( $test ) ) { - return array( - 'description' => sprintf( - /* translators: %s: Name of the filter used. */ - __( 'Could not confirm that the %s filter is available.' ), - 'wp_version_check()'
- ),
- 'severity' => 'warning',
- );
- }
-
- $response = wp_remote_retrieve_body( $test );
-
- if ( 'yes' !== $response ) {
+ if ( ! has_filter( 'wp_version_check', 'wp_version_check' ) ) {
return array(
'description' => sprintf(
/* translators: %s: Name of the filter used. */
@@ -305,6 +266,11 @@
* @return array The test results.
*/
function test_check_wp_filesystem_method() {
+ // Make sure the `request_filesystem_credentials` function is available during our REST call.
+ if ( ! function_exists( 'request_filesystem_credentials' ) ) {
+ require_once( ABSPATH . '/wp-admin/includes/file.php' );
+ }
+
$skin = new Automatic_Upgrader_Skin;
$success = $skin->request_filesystem_credentials( false, ABSPATH );
@@ -351,6 +317,11 @@
return false;
}
+ // Make sure the `get_core_checksums` function is available during our REST call.
+ if ( ! function_exists( 'get_core_checksums' ) ) {
+ require_once( ABSPATH . '/wp-admin/includes/update.php' );
+ }
+
$checksums = get_core_checksums( $wp_version, 'en_US' );
$dev = ( false !== strpos( $wp_version, '-' ) );
// Get the last stable version's files and test against that.
Index: src/wp-includes/rest-api.php
===================================================================
--- src/wp-includes/rest-api.php (revision 9568134d7b1f857322745e0694730a209fd7d2cb)
+++ src/wp-includes/rest-api.php (date 1593115393878)
@@ -281,6 +281,10 @@
$controller = new WP_REST_Themes_Controller;
$controller->register_routes();
+ // Site Health
+ $controller = new WP_REST_Site_Health_Controller;
+ $controller->register_routes();
+
}
/**
Index: src/wp-admin/site-health.php
===================================================================
--- src/wp-admin/site-health.php (revision 9568134d7b1f857322745e0694730a209fd7d2cb)
+++ src/wp-admin/site-health.php (date 1593117675919)
@@ -23,15 +23,6 @@
wp_enqueue_style( 'site-health' );
wp_enqueue_script( 'site-health' );
-if ( ! class_exists( 'WP_Site_Health' ) ) {
- require_once ABSPATH . 'wp-admin/includes/class-wp-site-health.php';
-}
-
-$health_check_site_status = WP_Site_Health::get_instance();
-
-// Start by checking if this is a special request checking for the existence of certain filters.
-$health_check_site_status->check_wp_version_check_exists();
-
require_once ABSPATH . 'wp-admin/admin-header.php';
?>