Fix parsing deeply nested POST structures

Author: clue

src/Io/MultipartParser.php

@@ -250,29 +250,27 @@ private function extractPost($postFields, $key, $value)
             return $postFields;
         }
 
-        $chunkKey = $chunks[0];
-        if (!isset($postFields[$chunkKey])) {
-            $postFields[$chunkKey] = array();
-        }
-
+        $chunkKey = rtrim($chunks[0], ']');
         $parent = &$postFields;
         for ($i = 1; $i < count($chunks); $i++) {
             $previousChunkKey = $chunkKey;
-            if (!isset($parent[$previousChunkKey])) {
+            if ($previousChunkKey !== '' && !isset($parent[$previousChunkKey])) {
                 $parent[$previousChunkKey] = array();
             }
-            $parent = &$parent[$previousChunkKey];
-            $chunkKey = $chunks[$i];
 
-            if ($chunkKey == ']') {
-                $parent[] = $value;
-                return $postFields;
+            if ($previousChunkKey === '') {
+                $parent = &$parent[0];
+            } else {
+                $parent = &$parent[$previousChunkKey];
             }
 
-            $chunkKey = rtrim($chunkKey, ']');
+            $chunkKey = rtrim($chunks[$i], ']');
             if ($i == count($chunks) - 1) {
-                $parent[$chunkKey] = $value;
-                return $postFields;
+                if ($chunkKey === '') {
+                    $parent[] = $value;
+                } else {
+                    $parent[$chunkKey] = $value;
+                }
             }
         }
 

tests/Io/MultipartParserTest.php

@@ -51,7 +51,6 @@ public function testEmptyPostValue()
         $data .= "\r\n";
         $data .= "--$boundary--\r\n";
 
-
         $request = new ServerRequest('POST', 'http://example.com/', array(
             'Content-Type' => 'multipart/mixed; boundary=' . $boundary,
         ), $data, 1.1);
@@ -77,7 +76,6 @@ public function testEmptyPostKey()
         $data .= "value\r\n";
         $data .= "--$boundary--\r\n";
 
-
         $request = new ServerRequest('POST', 'http://example.com/', array(
             'Content-Type' => 'multipart/mixed; boundary=' . $boundary,
         ), $data, 1.1);
@@ -93,6 +91,64 @@ public function testEmptyPostKey()
         );
     }
 
+    public function testNestedPostKeyAssoc()
+    {
+        $boundary = "---------------------------5844729766471062541057622570";
+
+        $data  = "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"a[b][c]\"\r\n";
+        $data .= "\r\n";
+        $data .= "value\r\n";
+        $data .= "--$boundary--\r\n";
+
+        $request = new ServerRequest('POST', 'http://example.com/', array(
+            'Content-Type' => 'multipart/mixed; boundary=' . $boundary,
+        ), $data, 1.1);
+
+        $parsedRequest = MultipartParser::parseRequest($request);
+
+        $this->assertEmpty($parsedRequest->getUploadedFiles());
+        $this->assertSame(
+            array(
+                'a' => array(
+                    'b' => array(
+                        'c' => 'value'
+                    )
+                )
+            ),
+            $parsedRequest->getParsedBody()
+        );
+    }
+
+    public function testNestedPostKeyVector()
+    {
+        $boundary = "---------------------------5844729766471062541057622570";
+
+        $data  = "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"a[][]\"\r\n";
+        $data .= "\r\n";
+        $data .= "value\r\n";
+        $data .= "--$boundary--\r\n";
+
+        $request = new ServerRequest('POST', 'http://example.com/', array(
+            'Content-Type' => 'multipart/mixed; boundary=' . $boundary,
+        ), $data, 1.1);
+
+        $parsedRequest = MultipartParser::parseRequest($request);
+
+        $this->assertEmpty($parsedRequest->getUploadedFiles());
+        $this->assertSame(
+            array(
+                'a' => array(
+                    array(
+                        'value'
+                    )
+                )
+            ),
+            $parsedRequest->getParsedBody()
+        );
+    }
+
     public function testFileUpload()
     {
         $boundary = "---------------------------12758086162038677464950549563";