[HttpKernel] don't call getTrustedHeaderName() if possible #22873
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stof
reviewed
May 23, 2017
| $currentXForwardedFor = $request->headers->get($trustedHeaderName, ''); | ||
|
|
||
| $server['HTTP_'.$trustedHeaderName] = ($currentXForwardedFor ? $currentXForwardedFor.', ' : '').$request->getClientIp(); | ||
| } elseif (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) { |
Member
There was a problem hiding this comment.
Actually, the non-deprecated API should be tried first, to use it when it is available IMO
Member
Author
There was a problem hiding this comment.
In fact, I think that we can just fix this in 3.3.
xabbuh
force-pushed
the
http-foundation-forward-compatibility
branch
from
cd52a80 to
29c9d8c
Compare
xabbuh
force-pushed
the
http-foundation-forward-compatibility
branch
from
29c9d8c to
0ae049b
Compare
xabbuh
force-pushed
the
http-foundation-forward-compatibility
branch
from
0ae049b to
ccf2275
Compare
stof
reviewed
May 23, 2017
| // will be included into trusted header for client ip | ||
| try { | ||
| if ($trustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP, false)) { | ||
| $hasTrustedHeaderSet = method_exists(Request::class, 'getTrustedHeaderSet'); |
Member
There was a problem hiding this comment.
I would avoid this check by bumping the min version of HttpFoundation in HttpKernel
xabbuh
force-pushed
the
http-foundation-forward-compatibility
branch
2 times, most recently
from
7e0c424 to
b17d932
Compare
xabbuh
force-pushed
the
http-foundation-forward-compatibility
branch
from
b17d932 to
6350dab
Compare
xabbuh
changed the title
Member
|
Thank you @xabbuh. |
nicolas-grekas
added a commit
that referenced
this pull request
May 25, 2017
… (xabbuh) This PR was merged into the 3.3 branch. Discussion ---------- [HttpKernel] don't call getTrustedHeaderName() if possible | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | https://travis-ci.org/symfony/symfony/jobs/235008102 (failing tests of #22863) | License | MIT | Doc PR | Commits ------- 6350dab don't call getTrustedHeaderName() if possible
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.