bug #40281 [FrameworkBundle] Allow x-forwarded-prefix trusted header in config (drupol)

nicolas-grekas · nicolas-grekas · commit 5028aaf542bd · 2021-02-23T16:58:27.000+01:00
This PR was submitted for the 5.x branch but it was merged into the 5.2 branch instead. Discussion ---------- [FrameworkBundle] Allow x-forwarded-prefix trusted header in config | Q | A | ------------- | --- | Branch? | 5.2 (as requested by @nicolas-grekas) | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Support for `X_FORWARDED_PREFIX` has been added in PR #37734. However, it is impossible to use it because the configuration doesn't allow the `x-forwarded-prefix` value in `framework.yaml`. Commits ------- 95fdd90 Allow x-forwarded-prefix trusted header.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -97,7 +97,7 @@ public function getConfigTreeBuilder()
                     ->enumPrototype()
                         ->values([
                             'forwarded',
-                            'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port',
+                            'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix',
                         ])
                     ->end()
                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2305,6 +2305,7 @@ private function resolveTrustedHeaders(array $headers): int
                 case 'x-forwarded-host': $trustedHeaders |= Request::HEADER_X_FORWARDED_HOST; break;
                 case 'x-forwarded-proto': $trustedHeaders |= Request::HEADER_X_FORWARDED_PROTO; break;
                 case 'x-forwarded-port': $trustedHeaders |= Request::HEADER_X_FORWARDED_PORT; break;
+                case 'x-forwarded-prefix': $trustedHeaders |= Request::HEADER_X_FORWARDED_PREFIX; break;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2305,6 +2305,7 @@ private function resolveTrustedHeaders(array $headers): int`
`2305`	`2305`	`case 'x-forwarded-host': $trustedHeaders \|= Request::HEADER_X_FORWARDED_HOST; break;`
`2306`	`2306`	`case 'x-forwarded-proto': $trustedHeaders \|= Request::HEADER_X_FORWARDED_PROTO; break;`
`2307`	`2307`	`case 'x-forwarded-port': $trustedHeaders \|= Request::HEADER_X_FORWARDED_PORT; break;`
	`2308`	`+ case 'x-forwarded-prefix': $trustedHeaders \|= Request::HEADER_X_FORWARDED_PREFIX; break;`
`2308`	`2309`	`}`
`2309`	`2310`	`}`
`2310`	`2311`