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

Don't assume port 0 for X-Forwarded-Port #32096

Merged
merged 4 commits into from Jul 8, 2019
Merged

Don't assume port 0 for X-Forwarded-Port #32096

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
23db9be
Don't assume port 0 for X-Forwarded-Port
alexbowers Jun 19, 2019
c266d6c
Update Request.php
alexbowers Jun 19, 2019
6c49a0c
Add test case
alexbowers Jun 30, 2019
adcdd93
PHP 5 compat
xabbuh Jul 4, 2019
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
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpFoundation/Request.php
View file
Open in desktop
Expand Up @@ -1037,8 +1037,8 @@ public function getPort()
$pos = strrpos($host, ':');
}

if (false !== $pos) {
return (int) substr($host, $pos + 1);
if (false !== $pos && $port = substr($host, $pos + 1)) {
return (int) $port;
}

return 'https' === $this->getScheme() ? 443 : 80;
Expand Down
12 changes: 12 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View file
Open in desktop
Expand Up @@ -2427,6 +2427,18 @@ public function testTrustedPort()

$this->assertSame(443, $request->getPort());
}

public function testTrustedPortDoesNotDefaultToZero()
{
Request::setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_ALL);

$request = Request::create('/');
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$request->headers->set('X-Forwarded-Host', 'test.example.com');
$request->headers->set('X-Forwarded-Port', null);
Copy link
Member

Choose a reason for hiding this comment

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

HeaderBag::set does not accept null. Maybe you meant to use an empty string.

Copy link
Member

Choose a reason for hiding this comment

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

bd498f2


$this->assertSame(80, $request->getPort());
}
}

class RequestContentProxy extends Request
Expand Down