Changeset 39609

Timestamp:

12/16/2016 05:42:23 AM (10 years ago)

Author:

dd32

Message:

REST API: Do not error on empty JSON body

It's fairly common for clients to send Content-Type: application/json with an
empty body. While technically not valid JSON, we've historically supported
this behaviour, so it shouldn't cause an error.

Props JPry, jnylen0.
Merges [39594] to the 4.7 branch.
Fixes #39150.

Location:

branches/4.7

Files:

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

branches/4.7/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -670 +670 @@
                 }
 
-                $params = json_decode( $this->get_body(), true );
+                $body = $this->get_body();
+                if ( empty( $body ) ) {
+                        return true;
+                }
+
+                $params = json_decode( $body, true );
 
                 /*

branches/4.7/tests/phpunit/tests/rest-api/rest-request.php

@@ -11 +11 @@
  */
 class Tests_REST_Request extends WP_UnitTestCase {
+        public $request;
+
         public function setUp() {
                 parent::setUp();
@@ -413 +415 @@
                 $data = $valid->get_error_data();
                 $this->assertEquals( JSON_ERROR_SYNTAX, $data['json_error_code'] );
+        }
+
+
+        public function test_has_valid_params_empty_json_no_error() {
+                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
+                        return $this->markTestSkipped( 'JSON validation is only available for PHP 5.3+' );
+                }
+
+                $this->request->set_header( 'Content-Type', 'application/json' );
+                $this->request->set_body( '' );
+
+                $valid = $this->request->has_valid_params();
+                $this->assertNotWPError( $valid );
         }