[Request] Ignore invalid IP addresses sent by proxies #16736
Closed
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
| @@ -858,7 +858,8 @@ public function testGetClientIpsForwardedProvider() | |||
| // $expected $remoteAddr $httpForwarded $trustedProxies | |||
| return array( | |||
| array(array('127.0.0.1'), '127.0.0.1', 'for="_gazonk"', null), | |||
| array(array('_gazonk'), '127.0.0.1', 'for="_gazonk"', array('127.0.0.1')), | |||
| array(array('127.0.0.1'), '127.0.0.1', 'for="_gazonk"', array('127.0.0.1')), | |||
There was a problem hiding this comment.
This test case is modified, but returning something different that an IP address here looks broken.
There was a problem hiding this comment.
We already have this test case. See line above.
There was a problem hiding this comment.
There is no trusted proxy on the previous test.
| } | ||
| } | ||
|
|
||
| // Now the IP chain contains only untrusted proxies and the client IP | ||
| return $clientIps ? array_reverse($clientIps) : array($ip); | ||
| return $clientIps ? array_reverse($clientIps) : array($firstTrustedIp); |
There was a problem hiding this comment.
wouldn't this now be able to return array(null) in some cases though ?
There was a problem hiding this comment.
@GromNaN Any thoughts about this?
There was a problem hiding this comment.
If the REMOTE_ADDR header contains an invalid IP address maybe.
|
Thank you @GromNaN. |
fabpot
added a commit
that referenced
this pull request
Jan 25, 2016
…mNaN) This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16736). Discussion ---------- [Request] Ignore invalid IP addresses sent by proxies | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | ? | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15525 | License | MIT | Doc PR | n/a The [RFC 7239](https://tools.ietf.org/html/rfc7239#section-6.2) allows other values that IP addresses to be passed in `Forwarded`header and [Nginx can add `unknown` to the `X-Forwarded-For`header](http://www.squid-cache.org/Doc/config/forwarded_for/). To prevent these invalid IP addresses from being returned as "Client IP", this PR ensure that they are excluded. Commits ------- 6578806 [Request] Ignore invalid IP addresses sent by proxies
Merged
This was referenced Feb 28, 2016
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The RFC 7239 allows other values that IP addresses to be passed in
Forwardedheader and Nginx can addunknownto theX-Forwarded-Forheader.To prevent these invalid IP addresses from being returned as "Client IP", this PR ensure that they are excluded.