vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Security: Allow short-circuiting the wp_update_https_detection_errors() process.

Browse Source 
This changeset introduces a `pre_wp_update_https_detection_errors` filter which can be used to short-circuit the default logic for detecting problems with HTTPS support for the site, by returning a `WP_Error` object.

Props timothyblynjacobs.
See #47577.


git-svn-id: https://develop.svn.wordpress.org/trunk@50075 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz 2021-01-29 19:58:39 +00:00
parent 75901d9ea2
commit afdb88e9cf
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,23 @@ function wp_is_https_supported() {
* @access private
*/
function wp_update_https_detection_errors() {
/**
* Short-circuits the process of detecting errors related to HTTPS support.
*
* Returning a `WP_Error` from the filter will effectively short-circuit the default logic of trying a remote
* request to the site over HTTPS, storing the errors array from the returned `WP_Error` instead.
*
* @since 5.7.0
*
* @param null|WP_Error $pre Error object to short-circuit detection,
* or null to continue with the default behavior.
*/
$support_errors = apply_filters( 'pre_wp_update_https_detection_errors', null );
if ( is_wp_error( $support_errors ) ) {
update_option( 'https_detection_errors', $support_errors->errors );
return;
}
$support_errors = new WP_Error();
$response = wp_remote_request(

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

@ -109,6 +109,37 @@ class Tests_HTTPS_Detection extends WP_UnitTestCase {
$this->assertEquals( 'https://example.com/', $this->last_request_url );
}
/**
* @ticket 47577
*/
public function test_pre_wp_update_https_detection_errors() {
// Override to enforce no errors being detected.
add_filter(
'pre_wp_update_https_detection_errors',
function() {
return new WP_Error();
}
);
wp_update_https_detection_errors();
$this->assertEquals( array(), get_option( 'https_detection_errors' ) );
// Override to enforce an error being detected.
add_filter(
'pre_wp_update_https_detection_errors',
function() {
return new WP_Error(
'ssl_verification_failed',
'Bad SSL certificate.'
);
}
);
wp_update_https_detection_errors();
$this->assertEquals(
array( 'ssl_verification_failed' => array( 'Bad SSL certificate.' ) ),
get_option( 'https_detection_errors' )
);
}
/**
* @ticket 47577
*/