Changeset 60635

Timestamp:

08/14/2025 09:14:18 PM (14 months ago)

Author:

SergeyBiryukov

Message:

REST API: Correct error handling in WP_REST_Server::serve_batch_request_v1().

This aims to avoid a fatal error when hitting the batch request endpoint with a malformed URL.

Follow-up to [49252].

Props bor0, SirLouen, SergeyBiryukov.
Fixes #63502.

Location:

trunk

Files:

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

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

@@ -1748 +1748 @@
 
                 foreach ( $requests as $single_request ) {
+                        if ( is_wp_error( $single_request ) ) {
+                                $has_error    = true;
+                                $validation[] = $single_request;
+                                continue;
+                        }
+
                         $match     = $this->match_request_to_handler( $single_request );
                         $matches[] = $match;
@@ -1818 +1824 @@
 
                 foreach ( $requests as $i => $single_request ) {
+                        if ( is_wp_error( $single_request ) ) {
+                                $result      = $this->error_to_response( $single_request );
+                                $responses[] = $this->envelope_response( $result, false )->get_data();
+                                continue;
+                        }
+
                         $clean_request = clone $single_request;
                         $clean_request->set_url_params( array() );

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

@@ -2331 +2331 @@
 
         /**
+         * @ticket 63502
+         */
+        public function test_batch_request_with_malformed_url() {
+                $request = new WP_REST_Request( 'POST', '/batch/v1' );
+                $request->set_header( 'Content-Type', 'application/json' );
+                $request->set_body_params(
+                        array(
+                                'requests' => array(
+                                        array(
+                                                'method' => 'POST',
+                                                'path'   => 'http://user@:80',
+                                        ),
+                                ),
+                        )
+                );
+
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data()['responses'][0]['body'] ?? null;
+
+                $this->assertIsArray( $data );
+                $this->assertSame( 'parse_path_failed', $data['code'] );
+        }
+
+        /**
          * @ticket 51020
          */