Changeset 50471 for trunk

Timestamp:

03/02/2021 03:06:34 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Security, Site Health: Do not store HTTPS request error messages in an option.

This changes the logic in update_https_detection_errors() to never store error messages from the actual request since they could use a different encoding, which would make storing them in an option potentially fail, leading WordPress to then falsely assume that HTTPS is supported.

While this doesn't actually fix the encoding issue, it is not crucial to do so anyway, since these messages are not used anywhere. A simple differentiation between whether the overall HTTPS request or only the SSL verification failed should be sufficient for the purpose of this function.

Props flixos90, tmatsuur, lukecarbis.
Fixes #52484.

Location:

trunk

Files:

• src/wp-includes/https-detection.php (modified) (1 diff)
• tests/phpunit/tests/https-detection.php (modified) (2 diffs)

trunk/src/wp-includes/https-detection.php

@@ -131 +131 @@
         if ( is_wp_error( $unverified_response ) ) {
             $support_errors->add(
-                $unverified_response->get_error_code(),
-                $unverified_response->get_error_message()
+                'https_request_failed',
+                __( 'HTTPS request failed.' )
             );
         } else {
             $support_errors->add(
                 'ssl_verification_failed',
-                $response->get_error_message()
+                __( 'SSL verification failed.' )
             );
         }

trunk/tests/phpunit/tests/https-detection.php

@@ -57 +57 @@
     /**
      * @ticket 47577
+     * @ticket 52484
      */
     public function test_wp_update_https_detection_errors() {
@@ -69 +70 @@
 
         // If initial request fails and request without SSL verification succeeds,
-        // return error with 'ssl_verification_failed' error code.
+        // return 'ssl_verification_failed' error.
         add_filter( 'pre_http_request', array( $this, 'mock_error_with_sslverify' ), 10, 2 );
         add_filter( 'pre_http_request', array( $this, 'mock_success_without_sslverify' ), 10, 2 );
         wp_update_https_detection_errors();
         $this->assertSame(
-            array( 'ssl_verification_failed' => array( 'Bad SSL certificate.' ) ),
+            array( 'ssl_verification_failed' => array( __( 'SSL verification failed.' ) ) ),
             get_option( 'https_detection_errors' )
         );
 
         // If both initial request and request without SSL verification fail,
-        // return actual error from request.
+        // return 'https_request_failed' error.
         add_filter( 'pre_http_request', array( $this, 'mock_error_with_sslverify' ), 10, 2 );
         add_filter( 'pre_http_request', array( $this, 'mock_error_without_sslverify' ), 10, 2 );
         wp_update_https_detection_errors();
         $this->assertSame(
-            array( 'bad_ssl_certificate' => array( 'Bad SSL certificate.' ) ),
+            array( 'https_request_failed' => array( __( 'HTTPS request failed.' ) ) ),
             get_option( 'https_detection_errors' )
         );