Allow X-Forwarded-For to have multiple values

kassner · kassner · commit b96bbcdfd9a7 · 2017-03-26T22:27:15.000+02:00
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -64,6 +64,11 @@ public function getRemoteAddress($ipToLong = false)
             return false;
         }
 
+        if (strpos($this->remoteAddress, ',') !== false) {
+            $ipList = explode(',', $this->remoteAddress);
+            $this->remoteAddress = trim(reset($ipList));
+        }
+
         return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ public function getRemoteAddress($ipToLong = false)`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ if (strpos($this->remoteAddress, ',') !== false) {`
	`68`	`+ $ipList = explode(',', $this->remoteAddress);`
	`69`	`+ $this->remoteAddress = trim(reset($ipList));`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;`
`68`	`73`	`}`
`69`	`74`