Changeset 9148

Timestamp:

09/24/2019 01:16:59 AM (7 years ago)

Author:

dd32

Message:

Login: Handle the various SSO routes a bit better when passing to reCaptcha.

See #4739.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php

@@ -84 +84 @@
         // reCaptcha v3 is loaded on all login pages, not just the registration flow.
         wp_enqueue_script( 'recaptcha-api-v3', 'https://www.google.com/recaptcha/api.js?onload=reCaptcha_v3_init&render=' . RECAPTCHA_V3_PUBKEY, array(), '3' );
+        $login_route = WP_WPOrg_SSO::$matched_route;
+        if ( ! $login_route || 'root' == $login_route ) {
+                $login_route = 'login';
+        }
+        // reCaptcha only supports [a-Z _/] as the action.
+        $login_route = preg_replace( '#[^a-z/_ ]#i', '_', $login_route );
+
         wp_add_inline_script(
                 'recaptcha-api-v3',
@@ -89 +96 @@
                         grecaptcha.execute(' .
                                 json_encode( RECAPTCHA_V3_PUBKEY ) .
-                                ', {action: ' . json_encode(
-                                        str_replace( '-', '_', WP_WPOrg_SSO::$matched_route ?: 'login' ) // Must match ^[a-Z_ ]$, but we use -
-                                ) .' }
+                                ', {action: ' . json_encode( $login_route ) . ' }
                         ).then( function( token ) {
                                 // Add the token to the "primary" form