diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 4510f7c52e83f..4fae46cb6e4ce 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -567,14 +567,22 @@ public function overrideGlobals()
*
* You should only list the reverse proxies that you manage directly.
*
- * @param array $proxies A list of trusted proxies
+ * @param array $proxies A list of trusted proxies, the string 'REMOTE_ADDR' will be replaced with $_SERVER['REMOTE_ADDR']
* @param int $trustedHeaderSet A bit field of Request::HEADER_*, to set which headers to trust from your proxies
*
* @throws \InvalidArgumentException When $trustedHeaderSet is invalid
*/
public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
{
- self::$trustedProxies = $proxies;
+ self::$trustedProxies = array_reduce($proxies, function ($proxies, $proxy) {
+ if ('REMOTE_ADDR' !== $proxy) {
+ $proxies[] = $proxy;
+ } elseif (isset($_SERVER['REMOTE_ADDR'])) {
+ $proxies[] = $_SERVER['REMOTE_ADDR'];
+ }
+
+ return $proxies;
+ }, []);
self::$trustedHeaderSet = $trustedHeaderSet;
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 8febdf6293586..1d016472515db 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2324,6 +2324,26 @@ public function testTrustedPortDoesNotDefaultToZero()
$this->assertSame(80, $request->getPort());
}
+
+ /**
+ * @dataProvider trustedProxiesRemoteAddr
+ */
+ public function testTrustedProxiesRemoteAddr($serverRemoteAddr, $trustedProxies, $result)
+ {
+ $_SERVER['REMOTE_ADDR'] = $serverRemoteAddr;
+ Request::setTrustedProxies($trustedProxies, Request::HEADER_X_FORWARDED_ALL);
+ $this->assertSame($result, Request::getTrustedProxies());
+ }
+
+ public function trustedProxiesRemoteAddr()
+ {
+ return [
+ ['1.1.1.1', ['REMOTE_ADDR'], ['1.1.1.1']],
+ ['1.1.1.1', ['REMOTE_ADDR', '2.2.2.2'], ['1.1.1.1', '2.2.2.2']],
+ [null, ['REMOTE_ADDR'], []],
+ [null, ['REMOTE_ADDR', '2.2.2.2'], ['2.2.2.2']],
+ ];
+ }
}
class RequestContentProxy extends Request
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy