Changeset 41223

Timestamp:

08/03/2017 07:54:56 PM (4 years ago)

Author:

jnylen0

Message:

REST API: Exclude numeric parameters from regex parsing

The list of endpoint parameters should only include explicitly named and requested parameters.

Props flixos90, rmccue, jnylen0.
Fixes #40704.

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

@@ -825 +825 @@
 
         foreach ( $this->get_routes() as $route => $handlers ) {
-            $match = preg_match( '@^' . $route . '$@i', $path, $args );
+            $match = preg_match( '@^' . $route . '$@i', $path, $matches );
 
             if ( ! $match ) {
                 continue;
+            }
+
+            $args = array();
+            foreach ( $matches as $param => $value ) {
+                if ( ! is_int( $param ) ) {
+                    $args[ $param ] = $value;
+                }
             }
 

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

@@ -161 +161 @@
         $response = $this->server->dispatch( $request );
         $this->assertEquals( 200, $response->get_status() );
+    }
+
+    public function test_url_params_no_numeric_keys() {
+
+        $this->server->register_route( 'test', '/test/(?P<data>.*)', array(
+            array(
+                'methods'  => WP_REST_Server::READABLE,
+                'callback' => '__return_false',
+                'args'     => array(
+                    'data' => array(),
+                ),
+            ),
+        ) );
+
+        $request = new WP_REST_Request( 'GET', '/test/some-value' );
+        $this->server->dispatch( $request );
+        $this->assertEquals( array( 'data' => 'some-value' ), $request->get_params() );
     }