Changeset 49904 for trunk/src/wp-admin/includes/class-wp-site-health.php

Timestamp:

12/23/2020 07:11:20 PM (6 years ago)

Author:

flixos90

Message:

Security, Site Health: Detect HTTPS support and encourage switching.

This changeset modifies the Site Health panel for HTTPS to provide more accurate recommendations based on whether the environment is already set up for HTTPS.

• Introduces wp_is_using_https() to check whether the site is configured to use HTTPS (via its Site Address and WordPress Address).
• Introduces wp_is_https_supported() to check whether the environment supports HTTPS. This relies on a cron job which periodically checks support using a loopback request.

Props Clorith, flixos90, miinasikk, westonruter.
Fixes #47577.

File:

• trunk/src/wp-admin/includes/class-wp-site-health.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -1494 +1494 @@
          *
          * @since 5.2.0
+         * @since 5.7.0 Updated to rely on {@see wp_is_using_https()} and {@see wp_is_https_supported()}.
          *
          * @return array The test results.
@@ -1499 +1500 @@
         public function get_test_https_status() {
                 $result = array(
-                        'label'       => __( 'Your website is using an active HTTPS connection.' ),
+                        'label'       => __( 'Your website is using an active HTTPS connection' ),
                         'status'      => 'good',
                         'badge'       => array(
@@ -1520 +1521 @@
                 );
 
-                if ( is_ssl() ) {
-                        $wp_url   = get_bloginfo( 'wpurl' );
-                        $site_url = get_bloginfo( 'url' );
-
-                        if ( 'https' !== substr( $wp_url, 0, 5 ) || 'https' !== substr( $site_url, 0, 5 ) ) {
-                                $result['status'] = 'recommended';
-
-                                $result['label'] = __( 'Only parts of your site are using HTTPS' );
-
+                if ( ! wp_is_using_https() ) {
+                        $result['status'] = 'critical';
+                        $result['label']  = __( 'Your website does not use HTTPS' );
+
+                        if ( is_ssl() ) {
                                 $result['description'] = sprintf(
                                         '<p>%s</p>',
@@ -1537 +1534 @@
                                         )
                                 );
-
-                                $result['actions'] .= sprintf(
+                        } else {
+                                $result['description'] = sprintf(
+                                        '<p>%s</p>',
+                                        sprintf(
+                                                /* translators: %s: URL to General Settings screen. */
+                                                __( 'Your <a href="%s">WordPress Address</a> is not set up to use HTTPS.' ),
+                                                esc_url( admin_url( 'options-general.php' ) )
+                                        )
+                                );
+                        }
+
+                        if ( wp_is_https_supported() ) {
+                                $result['description'] .= sprintf(
+                                        '<p>%s</p>',
+                                        __( 'HTTPS is already supported for your website.' )
+                                );
+
+                                $result['actions'] = sprintf(
                                         '<p><a href="%s">%s</a></p>',
                                         esc_url( admin_url( 'options-general.php' ) ),
                                         __( 'Update your site addresses' )
                                 );
-                        }
-                } else {
-                        $result['status'] = 'recommended';
-
-                        $result['label'] = __( 'Your site does not use HTTPS' );
+                        } else {
+                                $result['description'] .= sprintf(
+                                        '<p>%s</p>',
+                                        __( 'Talk to your web host about supporting HTTPS for your website.' )
+                                );
+                        }
                 }