Set getRemoteAddress to detect comma seperated RFC 7239 lists #1546
Conversation
This file contains 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
| @@ -58,6 +58,12 @@ public function getRemoteAddress($ipToLong = false) | |||
| if (!$this->remoteAddress) { | |||
| $this->remoteAddress = $this->request->getServer('REMOTE_ADDR'); | |||
| } | |||
|
|
|||
| if ((filter_var($this->remoteAddress, FILTER_VALIDATE_IP) !== true) && (strpos($this->remoteAddress, ',') !== true)) { | |||
There was a problem hiding this comment.
@IcyApril $this->remoteAddress will not be X-Forwarded-For headers. $this->request->getServer('REMOTE_ADDR') It calls http://framework.zend.com/apidoc/2.3/classes/Zend.Http.PhpEnvironment.Request.html#getServer under hood.
|
There is an alternativeHeaders field in the event REMOTE_ADDR; we must account for the fact this may be a comma separated list. |
|
We have automated a Magento Contributor License Agreement verifier for contributions sent to our GitHub projects. |
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.
RFC 7239 allows comma separated X-Forwarded-For headers. This modification ensures in the event the getRemoteAddress gets one via the alternativeHeaders variable, the correct client IP can be returned. This is done by getting the first IP in the list after detecting for a comma separated IP list.