Merge pull request #363 from ebimmel/server-requst-body-empty-when-request-from-dot-net-app

Server requst body empty when request from dot net app

Author: WyriHaximus

src/Io/MultipartParser.php

@@ -93,7 +93,7 @@ public function __construct($uploadMaxFilesize = null, $maxFileUploads = null)
     public function parse(ServerRequestInterface $request)
     {
         $contentType = $request->getHeaderLine('content-type');
-        if(!\preg_match('/boundary="?(.*)"?$/', $contentType, $matches)) {
+        if(!\preg_match('/boundary="?(.*?)"?$/', $contentType, $matches)) {
             return $request;
         }
 
@@ -278,7 +278,7 @@ private function parseHeaders($header)
     private function getParameterFromHeader(array $header, $parameter)
     {
         foreach ($header as $part) {
-            if (\preg_match('/' . $parameter . '="?(.*)"$/', $part, $matches)) {
+            if (\preg_match('/' . $parameter . '="?(.*?)"?$/', $part, $matches)) {
                 return $matches[1];
             }
         }

tests/Io/MultipartParserTest.php

@@ -66,6 +66,72 @@ public function testPostKey()
         );
     }
 
+    public function testPostWithQuotationMarkEncapsulatedBoundary()
+    {
+        $boundary = "---------------------------5844729766471062541057622570";
+
+        $data  = "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"users[one]\"\r\n";
+        $data .= "\r\n";
+        $data .= "single\r\n";
+        $data .= "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"users[two]\"\r\n";
+        $data .= "\r\n";
+        $data .= "second\r\n";
+        $data .= "--$boundary--\r\n";
+
+        $request = new ServerRequest('POST', 'http://example.com/', array(
+            'Content-Type' => 'multipart/form-data; boundary="' . $boundary . '"',
+        ), $data, 1.1);
+
+        $parser = new MultipartParser();
+        $parsedRequest = $parser->parse($request);
+
+        $this->assertEmpty($parsedRequest->getUploadedFiles());
+        $this->assertSame(
+            array(
+                'users' => array(
+                    'one' => 'single',
+                    'two' => 'second',
+                ),
+            ),
+            $parsedRequest->getParsedBody()
+        );
+    }
+
+    public function testPostFormDataNamesWithoutQuotationMark()
+    {
+        $boundary = "---------------------------5844729766471062541057622570";
+
+        $data  = "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=users[one]\r\n";
+        $data .= "\r\n";
+        $data .= "single\r\n";
+        $data .= "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=users[two]\r\n";
+        $data .= "\r\n";
+        $data .= "second\r\n";
+        $data .= "--$boundary--\r\n";
+
+        $request = new ServerRequest('POST', 'http://example.com/', array(
+            'Content-Type' => 'multipart/form-data; boundary="' . $boundary . '"',
+        ), $data, 1.1);
+
+        $parser = new MultipartParser();
+        $parsedRequest = $parser->parse($request);
+
+        $this->assertEmpty($parsedRequest->getUploadedFiles());
+        $this->assertSame(
+            array(
+                'users' => array(
+                    'one' => 'single',
+                    'two' => 'second',
+                ),
+            ),
+            $parsedRequest->getParsedBody()
+        );
+    }
+
     public function testPostStringOverwritesMap()
     {
         $boundary = "---------------------------5844729766471062541057622570";