vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-03 20:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Application Passwords: Show HTTPS required message without filtering when not enabled or not in local environment.

Browse Source 
When `add_filter( 'wp_is_application_passwords_available', '__return_false' )` exists, HTTPS requirement message is shown even if HTTPS is enabled on the site. This happens because `wp_is_application_passwords_available_for_user()` first invokes `wp_is_application_passwords_available()` which is filterable. The situation could happen if the `'wp_is_application_passwords_available_for_user'` filter returns `false`.

To fix this, the check for HTTPS (or if in a 'local' environment) is moved to a new function called `wp_is_application_passwords_supported()`. Then the return from this function is used as an OR condition for the Application Passwords section and for displaying the HTTPS required message.

Tests are included for both `wp_is_application_passwords_supported()` and `wp_is_application_passwords_available()`.

Follow-up to [51980], [51988].

Props davidbinda, SergeyBiryukov, ocean90, felipeelia, costdev, hellofromTonya.
Fixes #53658.

git-svn-id: https://develop.svn.wordpress.org/trunk@52398 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Tonya Mork
2021-12-21 02:43:18 +00:00
parent 84467812c8
commit b161cfc1ff
5 changed files with 107 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
View File

@@ -946,6 +946,86 @@ class WP_Test_REST_Application_Passwords_Controller extends WP_Test_REST_Control
$this->assertErrorResponse( 'rest_application_password_not_found', $response, 500 );
}
/**
* @ticket 53658
*
* @covers ::wp_is_application_passwords_supported
*/
public function test_wp_is_application_passwords_supported_with_https_only() {
$_SERVER['HTTPS'] = 'on';
$this->assertTrue( wp_is_application_passwords_supported() );
}
/**
* @ticket 53658
*
* @covers ::wp_is_application_passwords_supported
*/
public function test_wp_is_application_passwords_supported_with_local_environment_only() {
putenv( 'WP_ENVIRONMENT_TYPE=local' );
$actual = wp_is_application_passwords_supported();
// Revert to default behaviour so that other tests are not affected.
putenv( 'WP_ENVIRONMENT_TYPE' );
$this->assertTrue( $actual );
}
/**
* @dataProvider data_wp_is_application_passwords_available
*
* @ticket 53658
*
* @covers ::wp_is_application_passwords_available
*
* @param bool|string $expected The expected value.
* @param string|null $callback Optional. The callback for the `wp_is_application_passwords_available` hook.
* Default: null.
*/
public function test_wp_is_application_passwords_available( $expected, $callback = null ) {
remove_filter( 'wp_is_application_passwords_available', '__return_true' );
if ( $callback ) {
add_filter( 'wp_is_application_passwords_available', $callback );
}
if ( 'default' === $expected ) {
putenv( 'WP_ENVIRONMENT_TYPE=local' );
$expected = wp_is_application_passwords_supported();
}
$actual = wp_is_application_passwords_available();
if ( 'default' === $expected ) {
// Revert to default behaviour so that other tests are not affected.
putenv( 'WP_ENVIRONMENT_TYPE' );
}
$this->assertSame( $expected, $actual );
}
/**
* Data provider.
*
* @return array
*/
public function data_wp_is_application_passwords_available() {
return array(
'availability not forced' => array(
'expected' => 'default',
),
'availability forced true' => array(
'expected' => true,
'callback' => '__return_true',
),
'availability forced false' => array(
'expected' => false,
'callback' => '__return_false',
),
);
}
/**
* Sets up a REST API request to be authenticated using an App Password.
*