mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-22 13:12:11 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

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

Browse Source 
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.
Reviewed by flixos90, SergeyBiryukov.
Merges [50471] to the 5.7 branch.
Fixes #52484.

git-svn-id: https://develop.svn.wordpress.org/branches/5.7@50472 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2021-03-02 15:14:09 +00:00
parent 582df45458
commit da266e6ca5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/https-detection.php
View File

@ -130,13 +130,13 @@ function wp_update_https_detection_errors() {
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.' )
);
}

9
tests/phpunit/tests/https-detection.php
View File

@ -56,6 +56,7 @@ class Tests_HTTPS_Detection extends WP_UnitTestCase {
/**
* @ticket 47577
* @ticket 52484
*/
public function test_wp_update_https_detection_errors() {
// Set HTTP URL, the request below should use its HTTPS version.
@ -68,22 +69,22 @@ class Tests_HTTPS_Detection extends WP_UnitTestCase {
$this->assertSame( array(), get_option( 'https_detection_errors' ) );
// 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' )
);