Changeset 10979 for sites/trunk/common/includes/wporg-sso/wp-plugin.php

Timestamp:

05/14/2021 04:52:26 AM (5 years ago)

Author:

dd32

Message:

Login: Try normalising the request uri before matching against pages.

This might work around the bug causing an infinite loop on login.wordpress.org.

See r10973

File:

• sites/trunk/common/includes/wporg-sso/wp-plugin.php (modified) (1 diff)

sites/trunk/common/includes/wporg-sso/wp-plugin.php

@@ -302 +302 @@
                                         self::$matched_route_params = array();
                                         foreach ( $this->valid_sso_paths as $route => $regex ) {
-                                                if ( preg_match( '!^' . $regex . '(?:[/?]{1,2}.*)?$!', $_SERVER['REQUEST_URI'], $matches ) ) {
+                                                // Process the URI with trailing `/.`, `/..`, `/. ` and `/.%20` normalised to `/`.
+                                                $request_uri = preg_replace( '!/[ .]+$!', '/', urldecode( $_SERVER['REQUEST_URI'] ) );
+                                                if ( preg_match( '!^' . $regex . '(?:[/?]{1,2}.*)?$!', $request_uri, $matches ) ) {
                                                         self::$matched_route        = $route;
                                                         self::$matched_route_regex  = $regex;