Skip to content

Fixed URI parsing #207 #209

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
Aug 2, 2017
Merged

Fixed URI parsing #207 #209

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
209f7d3
Fixed URI parsing #207
aaronbonneau Jul 19, 2017
0c4b5b7
Limit absolute-form check to pass not beginning with '/'
aaronbonneau Jul 28, 2017
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
2 changes: 1 addition & 1 deletion src/RequestHeaderParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private function parseRequest($headers)
}

// ensure absolute-form request-target contains a valid URI
if (strpos($request->getRequestTarget(), '://') !== false) {
if (strpos($request->getRequestTarget(), '://') !== false && substr($request->getRequestTarget(), 0, 1) !== '/') {
$parts = parse_url($request->getRequestTarget());

// make sure value contains valid host component (IP or hostname), but no fragment
Expand Down
38 changes: 38 additions & 0 deletions tests/RequestHeaderParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,44 @@ public function testInvalidAbsoluteFormSchemeEmitsError()
$this->assertSame('Invalid absolute-form request-target', $error->getMessage());
}

public function testOriginFormWithSchemeSeparatorInParam()
{
$request = null;

$parser = new RequestHeaderParser();
$parser->on('error', $this->expectCallableNever());
$parser->on('headers', function ($parsedRequest, $parsedBodyBuffer) use (&$request) {
$request = $parsedRequest;
});

$parser->feed("GET /somepath?param=http://example.com HTTP/1.1\r\nHost: localhost\r\n\r\n");

$this->assertInstanceOf('Psr\Http\Message\RequestInterface', $request);
$this->assertSame('GET', $request->getMethod());
$this->assertEquals('http://localhost/somepath?param=http://example.com', $request->getUri());
$this->assertSame('1.1', $request->getProtocolVersion());
$headers = array(
'Host' => array('localhost')
);
$this->assertSame($headers, $request->getHeaders());
}

public function testUriStartingWithColonSlashSlashFails()
{
$error = null;

$parser = new RequestHeaderParser();
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
});

$parser->feed("GET ://example.com:80/ HTTP/1.0\r\n\r\n");

$this->assertInstanceOf('InvalidArgumentException', $error);
$this->assertSame('Invalid request string', $error->getMessage());
}

public function testInvalidAbsoluteFormWithFragmentEmitsError()
{
$error = null;
Expand Down