<!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>[60123] trunk: Application Passwords: Correct the fallback behaviour for application passwords that don't use a generic hash.</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/60123">60123</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/60123","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>2025-04-03 13:51:28 +0000 (Thu, 03 Apr 2025)</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: Correct the fallback behaviour for application passwords that don't use a generic hash.
Application passwords that aren't hashed using BLAKE2b should be checked using `wp_check_password()` rather than assuming they were hashed with phpass. This provides full back compat support for application passwords that were created via an overridden `wp_hash_password()` function that uses an alternative hashing algorithm.
Props snicco, debarghyabanerjee, peterwilsoncc, jorbin, johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/63203">#63203</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpapplicationpasswordsphp">trunk/src/wp-includes/class-wp-application-passwords.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsauthphp">trunk/tests/phpunit/tests/auth.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpapplicationpasswordsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-application-passwords.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-application-passwords.php 2025-04-02 22:23:08 UTC (rev 60122)
+++ trunk/src/wp-includes/class-wp-application-passwords.php 2025-04-03 13:51:28 UTC (rev 60123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,6 +502,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> string $password,
</span><span class="cx" style="display: block; padding: 0 10px"> string $hash
</span><span class="cx" style="display: block; padding: 0 10px"> ): bool {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_starts_with( $hash, '$generic$' ) ) {
+ /*
+ * If the hash doesn't start with `$generic$`, it is a hash created with `wp_hash_password()`.
+ * This is the case for application passwords created before 6.8.0.
+ */
+ return wp_check_password( $password, $hash );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_verify_fast_hash( $password, $hash );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2025-04-02 22:23:08 UTC (rev 60122)
+++ trunk/src/wp-includes/functions.php 2025-04-03 13:51:28 UTC (rev 60123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9149,8 +9149,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks whether a plaintext message matches the hashed value. Used to verify values hashed via wp_fast_hash().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The function uses Sodium to hash the message and compare it to the hashed value. If the hash is not a generic hash,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * the hash is treated as a phpass portable hash in order to provide backward compatibility for application passwords
- * which were hashed using phpass prior to WordPress 6.8.0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * the hash is treated as a phpass portable hash in order to provide backward compatibility for passwords and security
+ * keys which were hashed using phpass prior to WordPress 6.8.0.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestsauthphp"></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/auth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/auth.php 2025-04-02 22:23:08 UTC (rev 60122)
+++ trunk/tests/phpunit/tests/auth.php 2025-04-03 13:51:28 UTC (rev 60123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1135,6 +1135,29 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 21022
+ * @ticket 63203
+ */
+ public function test_plain_bcrypt_application_password_is_accepted() {
+ add_filter( 'application_password_is_api_request', '__return_true' );
+ add_filter( 'wp_is_application_passwords_available', '__return_true' );
+
+ $password = 'password';
+
+ // Set an application password with plain bcrypt, which mimics a password that was hashed with
+ // a custom `wp_hash_password()` in use.
+ $uuid = self::set_application_password_with_plain_bcrypt( $password, self::$user_id );
+
+ // Authenticate.
+ $user = wp_authenticate_application_password( null, self::USER_LOGIN, $password );
+
+ // Verify that the plain bcrypt hash for the application password was valid.
+ $this->assertNotWPError( $user );
+ $this->assertInstanceOf( 'WP_User', $user );
+ $this->assertSame( self::$user_id, $user->ID );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_usernames
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21022
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1592,6 +1615,19 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 21022
+ * @ticket 63203
+ *
+ * @covers WP_Application_Passwords::create_new_application_password
+ */
+ public function test_application_password_is_hashed_with_fast_hash() {
+ // Create a new app-only password.
+ list( , $item ) = WP_Application_Passwords::create_new_application_password( self::$user_id, array( 'name' => 'phpunit' ) );
+
+ $this->assertStringStartsWith( '$generic$', $item['password'] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42790
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_authenticate_application_password_respects_existing_user() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1966,6 +2002,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the tests
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers Tests_Auth::set_application_password_with_plain_bcrypt
+ *
+ * @ticket 21022
+ * @ticket 63203
+ */
+ public function test_set_application_password_with_plain_bcrypt() {
+ // Set an application password with the plain_bcrypt algorithm.
+ $uuid = self::set_application_password_with_plain_bcrypt( 'password', self::$user_id );
+
+ // Ensure the password is hashed with plain_bcrypt.
+ $hash = WP_Application_Passwords::get_user_application_password( self::$user_id, $uuid )['password'];
+ $this->assertStringStartsWith( '$2y$', $hash );
+ }
+
+ /**
+ * Creates an application password that is hashed using bcrypt instead of the generic algorithm.
+ *
+ * This is ultimately used to mimic a plugged version of `wp_hash_password()` that uses bcrypt and
+ * facilitate backwards compatibility testing.
+ *
+ * @param string $password The password to hash.
+ * @param int $user_id The user ID to associate the password with.
+ * @return string The UUID of the application password.
+ */
+ private static function set_application_password_with_plain_bcrypt( string $password, int $user_id ) {
+ return self::set_application_password( password_hash( $password, PASSWORD_BCRYPT ), $user_id );
+ }
+
+ /**
+ * Test the tests
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @covers Tests_Auth::set_application_password_with_phpass
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21022
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1979,13 +2046,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( '$P$', $hash );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Creates an application password that is hashed using a phpass portable hash instead of the generic algorithm.
+ *
+ * This facilitate backwards compatibility testing.
+ *
+ * @param string $password The password to hash.
+ * @param int $user_id The user ID to associate the password with.
+ * @return string The UUID of the application password.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> private static function set_application_password_with_phpass( string $password, int $user_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return self::set_application_password( self::$wp_hasher->HashPassword( $password ), $user_id );
+ }
+
+ /**
+ * Creates an application password using the given password hash.
+ *
+ * @param string $hash The password hash.
+ * @param int $user_id The user ID to associate the password with.
+ * @return string The UUID of the application password.
+ */
+ private static function set_application_password( string $hash, int $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $item = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'uuid' => $uuid,
</span><span class="cx" style="display: block; padding: 0 10px"> 'app_id' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'password' => self::$wp_hasher->HashPassword( $password ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'password' => $hash,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'created' => time(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_used' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_ip' => null,
</span></span></pre>
</div>
</div>
</body>
</html>