diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modify Request::getClientIp() to use IpUtils::checkIp()

Browse Source 
Adds the ability to use CIDR notation in the trusted proxy list
This commit is contained in:
Dmitrii Chekaliuk 2013-03-08 22:49:38 +02:00 committed by Fabien Potencier
parent 79cadc437d
commit ddc9e3892f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -688,7 +688,16 @@ class Request
$trustedProxies = !self::$trustedProxies ? array($ip) : self::$trustedProxies;
$ip = $clientIps[0];
$clientIps = array_values(array_diff($clientIps, $trustedProxies));
foreach ($clientIps as $key => $clientIp) {
foreach ($trustedProxies as $trustedProxy) {
if (IpUtils::checkIp($clientIp, $trustedProxy)) {
unset($clientIps[$key]);
continue 2;
}
}
}
return $clientIps ? array_reverse($clientIps) : array($ip);
}