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

[10.x] Update TrustProxies to rely on $headers if properly set #47844

Merged
merged 2 commits into from Jul 26, 2023
Merged

[10.x] Update TrustProxies to rely on $headers if properly set #47844

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
5c15302
Update trust proxies to rely on configuration if set
inxilpro Jul 26, 2023
09bb875
Remove constants from match statement since they'll never match
inxilpro Jul 26, 2023
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
18 changes: 11 additions & 7 deletions src/Illuminate/Http/Middleware/TrustProxies.php
View file
Open in desktop
Expand Up @@ -92,14 +92,18 @@ protected function setTrustedProxyIpAddressesToTheCallingIp(Request $request)
*/
protected function getTrustedHeaderNames()
{
if (is_int($this->headers)) {
return $this->headers;
}

return match ($this->headers) {
'HEADER_X_FORWARDED_AWS_ELB', Request::HEADER_X_FORWARDED_AWS_ELB => Request::HEADER_X_FORWARDED_AWS_ELB,
'HEADER_FORWARDED', Request::HEADER_FORWARDED => Request::HEADER_FORWARDED,
'HEADER_X_FORWARDED_FOR', Request::HEADER_X_FORWARDED_FOR => Request::HEADER_X_FORWARDED_FOR,
'HEADER_X_FORWARDED_HOST', Request::HEADER_X_FORWARDED_HOST => Request::HEADER_X_FORWARDED_HOST,
'HEADER_X_FORWARDED_PORT', Request::HEADER_X_FORWARDED_PORT => Request::HEADER_X_FORWARDED_PORT,
'HEADER_X_FORWARDED_PROTO', Request::HEADER_X_FORWARDED_PROTO => Request::HEADER_X_FORWARDED_PROTO,
'HEADER_X_FORWARDED_PREFIX', Request::HEADER_X_FORWARDED_PREFIX => Request::HEADER_X_FORWARDED_PREFIX,
'HEADER_X_FORWARDED_AWS_ELB' => Request::HEADER_X_FORWARDED_AWS_ELB,
'HEADER_FORWARDED' => Request::HEADER_FORWARDED,
'HEADER_X_FORWARDED_FOR' => Request::HEADER_X_FORWARDED_FOR,
'HEADER_X_FORWARDED_HOST' => Request::HEADER_X_FORWARDED_HOST,
'HEADER_X_FORWARDED_PORT' => Request::HEADER_X_FORWARDED_PORT,
'HEADER_X_FORWARDED_PROTO' => Request::HEADER_X_FORWARDED_PROTO,
'HEADER_X_FORWARDED_PREFIX' => Request::HEADER_X_FORWARDED_PREFIX,
default => Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_PREFIX | Request::HEADER_X_FORWARDED_AWS_ELB,
};
}
Expand Down
7 changes: 3 additions & 4 deletions tests/Http/Middleware/TrustProxiesTest.php
View file
Open in desktop
Expand Up @@ -301,8 +301,7 @@ public function test_x_forwarded_multiple_individual_headers_trusted()
{
$trustedProxy = $this->createTrustedProxy(
Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PREFIX |
Request::HEADER_X_FORWARDED_PROTO,
Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO,
'*'
);

Expand All @@ -316,7 +315,7 @@ public function test_x_forwarded_multiple_individual_headers_trusted()
$this->assertSame('serversforhackers.com', $request->getHost(),
'Assert trusted proxy used forwarded header for host');
$this->assertEquals(443, $request->getPort(), 'Assert trusted proxy used forwarded header for port');
$this->assertSame('/prefix', $request->getBaseUrl(), 'Assert trusted proxy used forwarded header for prefix');
$this->assertSame('', $request->getBaseUrl(), 'Assert trusted proxy did not use forwarded header for prefix');
});
}

Expand Down Expand Up @@ -362,7 +361,7 @@ public function test_is_reading_text_based_configurations()
* Fake an HTTP request by generating a Symfony Request object.
*
* @param array $serverOverrides
* @return \Symfony\Component\HttpFoundation\Request
* @return \Illuminate\Http\Request
*/
protected function createProxiedRequest($serverOverrides = [])
{
Expand Down