Skip to content

Fix parsing multipart request body with quoted header parameters (dot net) #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyriHaximus merged 2 commits into from
Jun 26, 2020
Merged

Fix parsing multipart request body with quoted header parameters (dot net) #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeef894
Greedy matching caused boundary string to contain quotation mark, mak…
ebimmel-ysp Jun 26, 2020
f07a923
Regex would only work for header parameters that are encapsulate betw…
ebimmel-ysp Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Io/MultipartParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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];
}
}
Expand Down
66 changes: 66 additions & 0 deletions tests/Io/MultipartParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down