Changeset 50131

Timestamp:

02/02/2021 12:08:01 AM (4 years ago)

Author:

flixos90

Message:

Security, Site Health: Make migrating a site to HTTPS a one-click interaction.

Switching a WordPress site from HTTP to HTTPS has historically been a tedious task. While on the surface the Site Address and WordPress Address have to be updated, existing content still remains using HTTP URLs where hard-coded in the database. Furthermore, updating _two_ URLs to migrate to HTTPS is still a fairly unintuitive step which is not clearly explained.

This changeset simplifies migration from HTTP to HTTPS and, where possible, makes it a one-click interaction.

• Automatically replace insecure versions of the Site Address (home_url()) with its HTTPS counterpart on the fly if the site has been migrated from HTTP to HTTPS. This is accomplished by introducing a https_migration_required option and enabling it when the home_url() is accordingly changed.
  • A new wp_replace_insecure_home_url() function is hooked into various pieces of content to replace URLs accordingly.
  • The migration only kicks in when the Site Address (home_url()) and WordPress Address (site_url()) match, which is the widely common case. Configurations where these differ are often maintained by more advanced users, where this migration routine would be less essential - something to potentially iterate on in the future though.
  • The migration does not actually update content in the database. More savvy users that prefer to do that can prevent the migration logic from running by either deleting the https_migration_required option or using the new wp_should_replace_insecure_home_url filter.
  • For fresh sites that do not have any content yet at the point of changing the URLs to HTTPS, the migration will also be skipped since it would not be relevant.
• Expose a primary action in the Site Health recommendation, if HTTPS is already supported by the environment, built on top of the HTTPS detection mechanism from [49904]. When clicked, the default behavior is to update home_url() and site_url() in one go to their HTTPS counterpart.
  • A new wp_update_urls_to_https() function takes care of the update routine.
  • A new update_https meta capability is introduced to control access.
  • If the site's URLs are controlled by constants, this update is not automatically possible, so in these scenarios the user is informed about that in the HTTPS status check in Site Health.
• Allow hosting providers to modify the URLs linked to in the HTTPS status check in Site Health, similar to how that is possible for the URLs around updating the PHP version.
  • A WP_UPDATE_HTTPS_URL environment variable or wp_update_https_url filter can be used to provide a custom URL with guidance about updating the site to use HTTPS.
  • A WP_DIRECT_UPDATE_HTTPS_URL environment variable or wp_direct_update_https_url filter can be used to provide a custom URL for the primary CTA to update the site to use HTTPS.

Props flixos90, timothyblynjacobs.
Fixes #51437.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-site-health.php (modified) (3 diffs)
• src/wp-admin/site-health.php (modified) (3 diffs)
• src/wp-includes/capabilities.php (modified) (1 diff)
• src/wp-includes/default-filters.php (modified) (4 diffs)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/https-migration.php (added)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/tests/https-migration.php (added)
• tests/phpunit/tests/user/capabilities.php (modified) (2 diffs)

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

@@ -1503 +1503 @@
         wp_update_https_detection_errors();
 
+        $default_update_url = wp_get_default_update_https_url();
+
         $result = array(
             'label'       => __( 'Your website is using an active HTTPS connection' ),
@@ -1515 +1517 @@
             ),
             'actions'     => sprintf(
-                '<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
-                /* translators: Documentation explaining HTTPS and why it should be used. */
-                esc_url( __( 'https://wordpress.org/support/article/why-should-i-use-https/' ) ),
+                '<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+                esc_url( $default_update_url ),
                 __( 'Learn more about why you should use HTTPS' ),
                 /* translators: Accessibility text. */
@@ -1581 +1582 @@
                 );
 
-                $result['actions'] = sprintf(
-                    '<p><a href="%s">%s</a></p>',
-                    esc_url( admin_url( 'options-general.php' ) ),
-                    __( 'Update your site addresses' )
-                );
+                if ( defined( 'WP_HOME' ) || defined( 'WP_SITEURL' ) ) {
+                    $result['description'] .= sprintf(
+                        '<p>%s</p>',
+                        sprintf(
+                            /* translators: 1: wp-config.php, 2: WP_HOME, 3: WP_SITEURL */
+                            __( 'However, your WordPress Address is currently controlled by a PHP constant and therefore cannot be updated. You need to edit your %1$s and remove or update the definitions of %2$s and %3$s.' ),
+                            '<code>wp-config.php</code>',
+                            '<code>WP_HOME</code>',
+                            '<code>WP_SITEURL</code>'
+                        )
+                    );
+                } elseif ( current_user_can( 'update_https' ) ) {
+                    $default_direct_update_url = add_query_arg( 'action', 'update_https', wp_nonce_url( admin_url( 'site-health.php' ), 'wp_update_https' ) );
+                    $direct_update_url         = wp_get_direct_update_https_url();
+
+                    if ( ! empty( $direct_update_url ) ) {
+                        $result['actions'] = sprintf(
+                            '<p class="button-container"><a class="button button-primary" href="%1$s" target="_blank" rel="noopener">%2$s<span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+                            esc_url( $direct_update_url ),
+                            __( 'Update your site to use HTTPS' ),
+                            /* translators: Accessibility text. */
+                            __( '(opens in a new tab)' )
+                        );
+                    } else {
+                        $result['actions'] = sprintf(
+                            '<p class="button-container"><a class="button button-primary" href="%1$s">%2$s</a></p>',
+                            esc_url( $default_direct_update_url ),
+                            __( 'Update your site to use HTTPS' )
+                        );
+                    }
+                }
             } else {
-                $result['description'] .= sprintf(
-                    '<p>%s</p>',
-                    __( 'Talk to your web host about supporting HTTPS for your website.' )
-                );
+                // If host-specific "Update HTTPS" URL is provided, include a link.
+                $update_url = wp_get_update_https_url();
+                if ( $update_url !== $default_update_url ) {
+                    $result['description'] .= sprintf(
+                        '<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+                        esc_url( $update_url ),
+                        __( 'Talk to your web host about supporting HTTPS for your website.' ),
+                        /* translators: Accessibility text. */
+                        __( '(opens in a new tab)' )
+                    );
+                } else {
+                    $result['description'] .= sprintf(
+                        '<p>%s</p>',
+                        __( 'Talk to your web host about supporting HTTPS for your website.' )
+                    );
+                }
             }
         } elseif ( ! wp_is_https_supported() ) {

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

@@ -15 +15 @@
 require_once __DIR__ . '/admin.php';
 
+wp_reset_vars( array( 'action' ) );
+
 $title = __( 'Site Health Status' );
 
@@ -26 +28 @@
 if ( ! class_exists( 'WP_Site_Health' ) ) {
     require_once ABSPATH . 'wp-admin/includes/class-wp-site-health.php';
+}
+
+if ( 'update_https' === $action ) {
+    check_admin_referer( 'wp_update_https' );
+
+    if ( ! current_user_can( 'update_https' ) ) {
+        wp_die( __( 'Sorry, you are not allowed to update this site to HTTPS.' ), 403 );
+    }
+
+    if ( ! wp_is_https_supported() ) {
+        wp_die( __( 'It looks like HTTPS is not supported for your website at this point.' ) );
+    }
+
+    $result = wp_update_urls_to_https();
+
+    wp_redirect( add_query_arg( 'https_updated', (int) $result, wp_get_referer() ) );
+    exit;
 }
 
@@ -41 +60 @@
         </h1>
     </div>
+
+    <?php
+    if ( isset( $_GET['https_updated'] ) ) {
+        if ( $_GET['https_updated'] ) {
+            ?>
+            <div id="message" class="notice notice-success is-dismissible"><p><?php _e( 'Site URLs switched to HTTPS.' ); ?></p></div>
+            <?php
+        } else {
+            ?>
+            <div id="message" class="notice notice-error is-dismissible"><p><?php _e( 'Site URLs could not be switched to HTTPS.' ); ?></p></div>
+            <?php
+        }
+    }
+    ?>
 
     <div class="health-check-title-section site-health-progress-wrapper loading hide-if-no-js">

trunk/src/wp-includes/capabilities.php

@@ -594 +594 @@
             }
             break;
+        case 'update_https':
+            if ( is_multisite() && ! is_super_admin( $user_id ) ) {
+                $caps[] = 'do_not_allow';
+            } else {
+                $caps[] = 'manage_options';
+                $caps[] = 'update_core';
+            }
+            break;
         case 'export_others_personal_data':
         case 'erase_others_personal_data':

trunk/src/wp-includes/default-filters.php

@@ -177 +177 @@
 add_filter( 'the_content', 'prepend_attachment' );
 add_filter( 'the_content', 'wp_filter_content_tags' );
+add_filter( 'the_content', 'wp_replace_insecure_home_url' );
 
 add_filter( 'the_excerpt', 'wptexturize' );
@@ -184 +185 @@
 add_filter( 'the_excerpt', 'shortcode_unautop' );
 add_filter( 'the_excerpt', 'wp_filter_content_tags' );
+add_filter( 'the_excerpt', 'wp_replace_insecure_home_url' );
 add_filter( 'get_the_excerpt', 'wp_trim_excerpt', 10, 2 );
 
@@ -210 +212 @@
 add_filter( 'widget_text_content', 'shortcode_unautop' );
 add_filter( 'widget_text_content', 'wp_filter_content_tags' );
+add_filter( 'widget_text_content', 'wp_replace_insecure_home_url' );
 add_filter( 'widget_text_content', 'do_shortcode', 11 ); // Runs after wpautop(); note that $post global will be null when shortcodes run.
+
+add_filter( 'wp_get_custom_css', 'wp_replace_insecure_home_url' );
 
 // RSS filters.
@@ -347 +352 @@
 add_action( 'wp_https_detection', 'wp_update_https_detection_errors' );
 add_filter( 'cron_request', 'wp_cron_conditionally_prevent_sslverify', 9999 );
+
+// HTTPS migration.
+add_action( 'update_option_home', 'wp_update_https_migration_required', 10, 2 );
 
 // 2 Actions 2 Furious.

trunk/src/wp-includes/functions.php

@@ -7582 +7582 @@
 
 /**
+ * Gets the URL to learn more about updating the site to use HTTPS.
+ *
+ * This URL can be overridden by specifying an environment variable `WP_UPDATE_HTTPS_URL` or by using the
+ * {@see 'wp_update_https_url'} filter. Providing an empty string is not allowed and will result in the
+ * default URL being used. Furthermore the page the URL links to should preferably be localized in the
+ * site language.
+ *
+ * @since 5.7.0
+ *
+ * @return string URL to learn more about updating to HTTPS.
+ */
+function wp_get_update_https_url() {
+    $default_url = wp_get_default_update_https_url();
+
+    $update_url = $default_url;
+    if ( false !== getenv( 'WP_UPDATE_HTTPS_URL' ) ) {
+        $update_url = getenv( 'WP_UPDATE_HTTPS_URL' );
+    }
+
+    /**
+     * Filters the URL to learn more about updating the HTTPS version the site is running on.
+     *
+     * Providing an empty string is not allowed and will result in the default URL being used. Furthermore
+     * the page the URL links to should preferably be localized in the site language.
+     *
+     * @since 5.7.0
+     *
+     * @param string $update_url URL to learn more about updating HTTPS.
+     */
+    $update_url = apply_filters( 'wp_update_https_url', $update_url );
+    if ( empty( $update_url ) ) {
+        $update_url = $default_url;
+    }
+
+    return $update_url;
+}
+
+/**
+ * Gets the default URL to learn more about updating the site to use HTTPS.
+ *
+ * Do not use this function to retrieve this URL. Instead, use {@see wp_get_update_https_url()} when relying on the URL.
+ * This function does not allow modifying the returned URL, and is only used to compare the actually used URL with the
+ * default one.
+ *
+ * @since 5.7.0
+ * @access private
+ *
+ * @return string Default URL to learn more about updating to HTTPS.
+ */
+function wp_get_default_update_https_url() {
+    /* translators: Documentation explaining HTTPS and why it should be used. */
+    return __( 'https://wordpress.org/support/article/why-should-i-use-https/' );
+}
+
+/**
+ * Gets the URL for directly updating the site to use HTTPS.
+ *
+ * A URL will only be returned if the `WP_DIRECT_UPDATE_HTTPS_URL` environment variable is specified or
+ * by using the {@see 'wp_direct_update_https_url'} filter. This allows hosts to send users directly to
+ * the page where they can update their site to use HTTPS.
+ *
+ * @since 5.7.0
+ *
+ * @return string URL for directly updating to HTTPS or empty string.
+ */
+function wp_get_direct_update_https_url() {
+    $direct_update_url = '';
+
+    if ( false !== getenv( 'WP_DIRECT_UPDATE_HTTPS_URL' ) ) {
+        $direct_update_url = getenv( 'WP_DIRECT_UPDATE_HTTPS_URL' );
+    }
+
+    /**
+     * Filters the URL for directly updating the PHP version the site is running on from the host.
+     *
+     * @since 5.7.0
+     *
+     * @param string $direct_update_url URL for directly updating PHP.
+     */
+    $direct_update_url = apply_filters( 'wp_direct_update_https_url', $direct_update_url );
+
+    return $direct_update_url;
+}
+
+/**
  * Get the size of a directory.
  *

trunk/src/wp-settings.php

@@ -173 +173 @@
 require ABSPATH . WPINC . '/template.php';
 require ABSPATH . WPINC . '/https-detection.php';
+require ABSPATH . WPINC . '/https-migration.php';
 require ABSPATH . WPINC . '/class-wp-user-request.php';
 require ABSPATH . WPINC . '/user.php';

trunk/tests/phpunit/tests/user/capabilities.php

@@ -271 +271 @@
             'deactivate_plugins'          => array( 'administrator' ),
             'update_php'                  => array( 'administrator' ),
+            'update_https'                => array( 'administrator' ),
             'export_others_personal_data' => array( 'administrator' ),
             'erase_others_personal_data'  => array( 'administrator' ),
@@ -306 +307 @@
             'deactivate_plugins'          => array(),
             'update_php'                  => array(),
+            'update_https'                => array(),
             'export_others_personal_data' => array( '' ),
             'erase_others_personal_data'  => array( '' ),