Changeset 47351

Timestamp:

02/24/2020 06:05:12 PM (13 months ago)

Author:

kadamwhite

Message:

REST API: Fix namespace shadowing issue in route matching logic.

Following [47260] a namespace such as "test-ns" prevents any namespace such as "test-ns/v1" from being found when matching routes.
While not best practice, this was an unintentional back-compat break; this patch restores the original behavior.

Props david.binda, TimothyBlynJacobs.
Fixes #48530.

Location:

trunk

Files:

• src/wp-includes/rest-api/class-wp-rest-server.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-server.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -880 +880 @@
         $path   = $request->get_route();
 
-        $routes = array();
+        $with_namespace = array();
 
         foreach ( $this->get_namespaces() as $namespace ) {
-            if ( 0 === strpos( ltrim( $path, '/' ), $namespace ) ) {
-                $routes = $this->get_routes( $namespace );
-                break;
-            }
-        }
-
-        if ( ! $routes ) {
+            if ( 0 === strpos( trailingslashit( ltrim( $path, '/' ) ), $namespace ) ) {
+                $with_namespace[] = $this->get_routes( $namespace );
+            }
+        }
+
+        if ( $with_namespace ) {
+            $routes = array_merge( ...$with_namespace );
+        } else {
             $routes = $this->get_routes();
         }

trunk/tests/phpunit/tests/rest-api/rest-server.php

@@ -1466 +1466 @@
     }
 
+    /**
+     * @ticket 48530
+     */
+    public function test_get_routes_no_namespace_overriding() {
+        register_rest_route(
+            'test-ns',
+            '/test',
+            array(
+                'methods'  => array( 'GET' ),
+                'callback' => function() {
+                    return new WP_REST_Response( 'data', 204 );
+                },
+            )
+        );
+        register_rest_route(
+            'test-ns/v1',
+            '/test',
+            array(
+                'methods'  => array( 'GET' ),
+                'callback' => function() {
+                    return new WP_REST_Response( 'data', 204 );
+                },
+            )
+        );
+
+        $request  = new WP_REST_Request( 'GET', '/test-ns/v1/test' );
+        $response = rest_get_server()->dispatch( $request );
+
+        $this->assertEquals( 204, $response->get_status(), '/test-ns/v1/test' );
+    }
+
     public function _validate_as_integer_123( $value, $request, $key ) {
         if ( ! is_int( $value ) ) {