Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit97d90e8

Browse files
[HttpFoundation] fix false-positive ConflictingHeadersException
1 parentf50ee9b commit97d90e8

File tree

2 files changed

+54
-2
lines changed

2 files changed

+54
-2
lines changed

‎src/Symfony/Component/HttpFoundation/Request.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,10 +1943,13 @@ private function getTrustedValues($type, $ip = null)
19431943

19441944
if (self::$trustedHeaders[self::HEADER_FORWARDED] &&$this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
19451945
$forwardedValues =$this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
1946-
$forwardedValues =preg_match_all(sprintf('{(?:%s)=(?:"?\[?)([a-zA-Z0-9\.:_\-/]*+)}',self::$forwardedParams[$type]),$forwardedValues,$matches) ?$matches[1] :array();
1946+
$forwardedValues =preg_match_all(sprintf('{(?:%s)="?([a-zA-Z0-9\.:_\-/\[\]]*+)}',self::$forwardedParams[$type]),$forwardedValues,$matches) ?$matches[1] :array();
19471947
if (self::HEADER_CLIENT_PORT ===$type) {
19481948
foreach ($forwardedValuesas$k =>$v) {
1949-
$forwardedValues[$k] =substr_replace($v,'0.0.0.0',0,strrpos($v,':'));
1949+
if (']' ===substr($v, -1) ||false ===$v =strrchr($v,':')) {
1950+
$v =$this->isSecure() ?':443' :':80';
1951+
}
1952+
$forwardedValues[$k] ='0.0.0.0'.$v;
19501953
}
19511954
}
19521955
}

‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,55 @@ public function testNonstandardRequests($requestUri, $queryString, $expectedPath
20712071
$this->assertEquals($expectedBaseUrl,$request->getBaseUrl());
20722072
$this->assertEquals($expectedBasePath,$request->getBasePath());
20732073
}
2074+
2075+
publicfunctiontestTrustedHost()
2076+
{
2077+
Request::setTrustedProxies(array('1.1.1.1'), -1);
2078+
2079+
$request = Request::create('/');
2080+
$request->server->set('REMOTE_ADDR','1.1.1.1');
2081+
$request->headers->set('Forwarded','host=localhost:8080');
2082+
$request->headers->set('X-Forwarded-Host','localhost:8080');
2083+
2084+
$this->assertSame('localhost:8080',$request->getHttpHost());
2085+
$this->assertSame(8080,$request->getPort());
2086+
2087+
$request = Request::create('/');
2088+
$request->server->set('REMOTE_ADDR','1.1.1.1');
2089+
$request->headers->set('Forwarded','host="[::1]:443"');
2090+
$request->headers->set('X-Forwarded-Host','[::1]:443');
2091+
$request->headers->set('X-Forwarded-Port',443);
2092+
2093+
$this->assertSame('[::1]:443',$request->getHttpHost());
2094+
$this->assertSame(443,$request->getPort());
2095+
}
2096+
2097+
publicfunctiontestTrustedPort()
2098+
{
2099+
Request::setTrustedProxies(array('1.1.1.1'), -1);
2100+
2101+
$request = Request::create('/');
2102+
$request->server->set('REMOTE_ADDR','1.1.1.1');
2103+
$request->headers->set('Forwarded','host=localhost:8080');
2104+
$request->headers->set('X-Forwarded-Port',8080);
2105+
2106+
$this->assertSame(8080,$request->getPort());
2107+
2108+
$request = Request::create('/');
2109+
$request->server->set('REMOTE_ADDR','1.1.1.1');
2110+
$request->headers->set('Forwarded','host=localhost');
2111+
$request->headers->set('X-Forwarded-Port',80);
2112+
2113+
$this->assertSame(80,$request->getPort());
2114+
2115+
$request = Request::create('/');
2116+
$request->server->set('REMOTE_ADDR','1.1.1.1');
2117+
$request->headers->set('Forwarded','host="[::1]"');
2118+
$request->headers->set('X-Forwarded-Proto','https');
2119+
$request->headers->set('X-Forwarded-Port',443);
2120+
2121+
$this->assertSame(443,$request->getPort());
2122+
}
20742123
}
20752124

20762125
class RequestContentProxyextends Request

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp