Changeset 49752 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

12/04/2020 09:42:52 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

App Passwords: Prevent conflicts when Basic Auth is already used by the site.

Application Passwords uses Basic Authentication to transfer authentication details. If the site is already using Basic Auth, for instance to implement a private staging environment, then the REST API will treat this as an authentication attempt and would end up generating an error for any REST API request.

Now, Application Password authentication will only be attempted if Application Passwords is in use by a site. This is flagged by setting an option whenever an Application Password is created. An upgrade routine is added to set this option if any App Passwords already exist.

Lastly, creating an Application Password will be prevented if the site appears to already be using Basic Authentication.

Props chexwarrior, georgestephanis, adamsilverstein, helen, Clorith, marybaum, TimothyBlynJacobs.
Fixes #51939.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (2 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -875 +875 @@
     }
 
-    if ( $wp_current_db_version < 49735 ) {
+    if ( $wp_current_db_version < 49752 ) {
         upgrade_560();
     }
@@ -2279 +2279 @@
         delete_transient( 'dirsize_cache' );
     }
+
+    if ( $wp_current_db_version < 49752 ) {
+        $results = $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT 1 FROM {$wpdb->usermeta} WHERE meta_key = %s LIMIT 1",
+                WP_Application_Passwords::USERMETA_KEY_APPLICATION_PASSWORDS
+            )
+        );
+
+        if ( ! empty( $results ) ) {
+            update_site_option( WP_Application_Passwords::OPTION_KEY_IN_USE, 1 );
+        }
+    }
 }