Skip to content
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

Jump to bottom

Do not imply having parsed the request body #27

Merged
merged 4 commits into from
Jun 6, 2020
Merged

Do not imply having parsed the request body #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9bc97d
Do not imply having parsed the request body
Zegnat Feb 3, 2019
cd3b5e0
Address assumptions made about MIME types
Zegnat Sep 14, 2019
6ee9d73
Add tests for filling parsedBody
Zegnat Sep 14, 2019
944edc7
Fix StyleCI response
Zegnat Jun 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/ServerRequestCreator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,30 @@ public function fromGlobals(): ServerRequestInterface

$headers = \function_exists('getallheaders') ? getallheaders() : static::getHeadersFromServer($_SERVER);

return $this->fromArrays($server, $headers, $_COOKIE, $_GET, $_POST, $_FILES, \fopen('php://input', 'r') ?: null);
$post = null;
if ('POST' === $this->getMethodFromEnv($server)) {
foreach ($headers as $headerName => $headerValue) {
if ('content-type' !== \strtolower($headerName)) {
continue;
}
if (\in_array(
\strtolower(\trim(\explode(';', $headerValue, 2)[0])),
['application/x-www-form-urlencoded', 'multipart/form-data']
)) {
$post = $_POST;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What will $_POST contain if it isnt a POST request with content type application/x-www-form-urlencoded or multipart/form-data?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is just an empty array.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. From my reading of PSR-7, getParsedBody should return null when no (parseable) request body was provided. If we pass along the empty array from $_POST that would be the same as saying we successfully parsed the body content, which may not have been try at al. E.g. we make no attempt to parse JSON bodies.

That is why I wanted to establish a clear difference between [] and null 😄

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you


break;
}
}
}

return $this->fromArrays($server, $headers, $_COOKIE, $_GET, $post, $_FILES, \fopen('php://input', 'r') ?: null);
}

/**
* {@inheritdoc}
*/
public function fromArrays(array $server, array $headers = [], array $cookie = [], array $get = [], array $post = [], array $files = [], $body = null): ServerRequestInterface
public function fromArrays(array $server, array $headers = [], array $cookie = [], array $get = [], array $post = null, array $files = [], $body = null): ServerRequestInterface
{
$method = $this->getMethodFromEnv($server);
$uri = $this->getUriFromEnvWithHTTP($server);
Expand Down
4 changes: 2 additions & 2 deletions src/ServerRequestCreatorInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function fromGlobals(): ServerRequestInterface;
* @param array $headers typically the output of getallheaders() or similar structure
* @param array $cookie typically $_COOKIE or similar structure
* @param array $get typically $_GET or similar structure
* @param array $post typically $_POST or similar structure
* @param array|null $post typically $_POST or similar structure, represents parsed request body
* @param array $files typically $_FILES or similar structure
* @param StreamInterface|resource|string|null $body Typically stdIn
*
Expand All @@ -42,7 +42,7 @@ public function fromArrays(
array $headers = [],
array $cookie = [],
array $get = [],
array $post = [],
array $post = null,
array $files = [],
$body = null
): ServerRequestInterface;
Expand Down
53 changes: 53 additions & 0 deletions tests/ServerRequestCreatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,4 +594,57 @@ public function testFailingStreamFromFile()
);
$this->assertEquals($expected, $created);
}

public function testNoParsedBodyWithoutPOSTMethod()
{
$_POST = ['a' => 'b', 'c' => 'd'];
$instance = $this->creator->fromGlobals();
$this->assertNull($instance->getParsedBody());
}

public function testNoParsedBodyWithPOSTMethodWithoutContentType()
{
$_SERVER['REQUEST_METHOD'] = 'POST';
$_POST = ['a' => 'b', 'c' => 'd'];
$instance = $this->creator->fromGlobals();
$this->assertNull($instance->getParsedBody());
}

/**
* @dataProvider dataContentTypesThatTriggerParsedBody
*/
public function testParsedBodyWithPOSTMethodDifferentContentType($parsedBody, $contentType)
{
$_SERVER['REQUEST_METHOD'] = 'POST';
$_SERVER['HTTP_CONTENT_TYPE'] = $contentType;
$_POST = ['a' => 'b', 'c' => 'd'];
$instance = $this->creator->fromGlobals();
$this->assertSame($parsedBody ? $_POST : null, $instance->getParsedBody());
}

public function dataContentTypesThatTriggerParsedBody()
{
return [
// Acceptable values
'Standard HTML Form' => [
true, 'application/x-www-form-urlencoded',
],
'HTML Form with MIME body' => [
true, 'multipart/form-data',
],
'Standard HTML Form, mixed case MIME' => [
true, 'appLication/x-WWW-form-URLEncoded',
],
'Standard HTML Form, surrounding whitespace' => [
true, ' application/x-www-form-urlencoded ',
],
'Standard HTML Form, with flags' => [
true, 'application/x-www-form-urlencoded;charset=utf-8',
],
// Nonacceptable values
'JSON is not parsed by PHP' => [
false, 'application/json',
],
];
}
}