check if params given to API are really an array

Signed-off-by: Artur Neumann <artur@jankaritech.com>

diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index 010d889070e19646f5f9e8d48bdab43af7c89ca5..770946c80d557959c0c9a3f7cac3b40ea639f5b2 100644 (file)
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -429,13 +429,12 @@ class Request implements \ArrayAccess, \Countable, IRequest {
                // 'application/json' must be decoded manually.
                if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
                        $params = json_decode(file_get_contents($this->inputStream), true);
-                       if ($params !== null && \count($params) > 0) {
+                       if (\is_array($params) && \count($params) > 0) {
                                $this->items['params'] = $params;
                                if ($this->method === 'POST') {
                                        $this->items['post'] = $params;
                                }
                        }
-
                        // Handle application/x-www-form-urlencoded for methods other than GET
                // or post correctly
                } elseif ($this->method !== 'GET'

diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index e15f3fe656cbada0fb2822e1768c1ac44506dfab..cd488225739059e3cfdd688f195eaac46e7c38a8 100644 (file)
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -207,9 +207,20 @@ class RequestTest extends \Test\TestCase {
                $this->assertSame('Joey', $request['nickname']);
        }
 
-       public function testNotJsonPost() {
+       public function notJsonDataProvider() {
+               return [
+                       ['this is not valid json'],
+                       ['"just a string"'],
+                       ['{"just a string"}'],
+               ];
+       }
+
+       /**
+        * @dataProvider notJsonDataProvider
+        */
+       public function testNotJsonPost($testData) {
                global $data;
-               $data = 'this is not valid json';
+               $data = $testData;
                $vars = [
                        'method' => 'POST',
                        'server' => ['CONTENT_TYPE' => 'application/json; utf-8']