<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55283] trunk: Application Passwords: Allow plain HTTP success and reject URLs when using a local environment type.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/55283">55283</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55283","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-02-07 17:43:55 +0000 (Tue, 07 Feb 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Application Passwords: Allow plain HTTP success and reject URLs when using a local environment type.
It's not uncommon for local environments to run over HTTP due to the relative complexity of configuring HTTPS for a local environment. This change allows HTTP URLs for application password responses when that is the case.
Props peterwilsoncc, wppunk, cadic, viralsampat
Fixes <a href="https://core.trac.wordpress.org/ticket/52617">#52617</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesUserphp">trunk/tests/phpunit/tests/admin/includesUser.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2023-02-07 17:41:11 UTC (rev 55282)
+++ trunk/src/wp-admin/includes/user.php 2023-02-07 17:43:55 UTC (rev 55283)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,6 +612,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks if the Authorize Application Password request is valid.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.2.0 Allow insecure HTTP connections for the local environment.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $request {
</span><span class="cx" style="display: block; padding: 0 10px"> * The array of request data. All arguments are optional and may be empty.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,12 +626,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return true|WP_Error True if the request is valid, a WP_Error object contains errors if not.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_is_authorize_application_password_request_valid( $request, $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error = new WP_Error();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error = new WP_Error();
+ $is_local = 'local' === wp_get_environment_type();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $request['success_url'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'http' === $scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'http' === $scheme && ! $is_local ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'invalid_redirect_scheme',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The success URL must be served over a secure connection.' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +643,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $request['reject_url'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'http' === $scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'http' === $scheme && ! $is_local ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'invalid_redirect_scheme',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The rejection URL must be served over a secure connection.' )
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesUserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesUser.php 2023-02-07 17:41:11 UTC (rev 55282)
+++ trunk/tests/phpunit/tests/admin/includesUser.php 2023-02-07 17:43:55 UTC (rev 55283)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,52 +7,82 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Admin_IncludesUser extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 42790
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test redirect URLs for application password authorization requests.
+ *
+ * @ticket 42790
+ * @ticket 52617
+ *
+ * @covers ::wp_is_authorize_application_password_request_valid
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_authorize_application_password_request_valid
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $request The request data to validate.
- * @param string $error_code The expected error code, empty if no error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array $request The request data to validate.
+ * @param string $expected_error_code The expected error code, empty if no error is expected.
+ * @param string $env The environment type. Defaults to 'production'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_is_authorize_application_password_request_valid( $request, $error_code ) {
- $error = wp_is_authorize_application_password_request_valid( $request, get_userdata( 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_authorize_application_password_request_valid( $request, $expected_error_code, $env = 'production' ) {
+ putenv( "WP_ENVIRONMENT_TYPE=$env" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $error_code ) {
- $this->assertWPError( $error );
- $this->assertSame( $error_code, $error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = wp_is_authorize_application_password_request_valid( $request, get_userdata( 1 ) );
+
+ putenv( 'WP_ENVIRONMENT_TYPE' );
+
+ if ( $expected_error_code ) {
+ $this->assertWPError( $actual, 'A WP_Error object is expected.' );
+ $this->assertSame( $expected_error_code, $actual->get_error_code(), 'Unexpected error code.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotWPError( $error );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $actual, 'A WP_Error object is not expected.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_is_authorize_application_password_request_valid() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array(
- array(
- array(),
- '',
- ),
- array(
- array( 'success_url' => 'http://example.org' ),
- 'invalid_redirect_scheme',
- ),
- array(
- array( 'reject_url' => 'http://example.org' ),
- 'invalid_redirect_scheme',
- ),
- array(
- array( 'success_url' => 'https://example.org' ),
- '',
- ),
- array(
- array( 'reject_url' => 'https://example.org' ),
- '',
- ),
- array(
- array( 'success_url' => 'wordpress://example' ),
- '',
- ),
- array(
- array( 'reject_url' => 'wordpress://example' ),
- '',
- ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $environment_types = array( 'local', 'development', 'staging', 'production' );
+
+ $datasets = array();
+ foreach ( $environment_types as $environment_type ) {
+ $datasets[ $environment_type . ' and no request arguments' ] = array(
+ 'request' => array(),
+ 'expected_error_code' => '',
+ 'env' => $environment_type,
+ );
+
+ $datasets[ $environment_type . ' and a "https" scheme "success_url"' ] = array(
+ 'request' => array( 'success_url' => 'https://example.org' ),
+ 'expected_error_code' => '',
+ 'env' => $environment_type,
+ );
+
+ $datasets[ $environment_type . ' and a "https" scheme "reject_url"' ] = array(
+ 'request' => array( 'reject_url' => 'https://example.org' ),
+ 'expected_error_code' => '',
+ 'env' => $environment_type,
+ );
+
+ $datasets[ $environment_type . ' and an app scheme "success_url"' ] = array(
+ 'request' => array( 'success_url' => 'wordpress://example' ),
+ 'expected_error_code' => '',
+ 'env' => $environment_type,
+ );
+
+ $datasets[ $environment_type . ' and an app scheme "reject_url"' ] = array(
+ 'request' => array( 'reject_url' => 'wordpress://example' ),
+ 'expected_error_code' => '',
+ 'env' => $environment_type,
+ );
+
+ $datasets[ $environment_type . ' and a "http" scheme "success_url"' ] = array(
+ 'request' => array( 'success_url' => 'http://example.org' ),
+ 'expected_error_code' => 'local' === $environment_type ? '' : 'invalid_redirect_scheme',
+ 'env' => $environment_type,
+ );
+
+ $datasets[ $environment_type . ' and a "http" scheme "reject_url"' ] = array(
+ 'request' => array( 'reject_url' => 'http://example.org' ),
+ 'expected_error_code' => 'local' === $environment_type ? '' : 'invalid_redirect_scheme',
+ 'env' => $environment_type,
+ );
+ }
+
+ return $datasets;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>