Skip to content

Commit 19a3267

Browse files
Merge branch '2.8' into 3.4
* 2.8: [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2 parents b00b9ce + 10f660d commit 19a3267

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Request.php

+5
Original file line numberDiff line numberDiff line change
@@ -2087,6 +2087,11 @@ private function getTrustedValues($type, $ip = null)
20872087
if (self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
20882088
$forwardedValues = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
20892089
$forwardedValues = preg_match_all(sprintf('{(?:%s)=(?:"?\[?)([a-zA-Z0-9\.:_\-/]*+)}', self::$forwardedParams[$type]), $forwardedValues, $matches) ? $matches[1] : array();
2090+
if (self::HEADER_CLIENT_PORT === $type) {
2091+
foreach ($forwardedValues as $k => $v) {
2092+
$forwardedValues[$k] = substr_replace($v, '0.0.0.0', 0, strrpos($v, ':'));
2093+
}
2094+
}
20902095
}
20912096

20922097
if (null !== $ip) {

0 commit comments

Comments
 (0)