RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHANGED] Parse X-FORWARDED-FOR when supplied

Browse Source 
Instead of trusting REMOTE_ADDR we should parse X-FORWARDED-FOR if
supplied. This will properly use the user IP in a multi-LB setup.

Needs testing
This commit is contained in:
Sebastian Grewe 2014-02-19 14:32:20 +01:00
parent dbbd57c761
commit 8bd469ba5d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/include/classes/user.class.php
View File

@ -148,7 +148,7 @@ class User extends Base {
$lastLoginTime = $this->getLastLogin($uid); $lastLoginTime = $this->getLastLogin($uid);
$this->updateLoginTimestamp($uid); $this->updateLoginTimestamp($uid);
$getIPAddress = $this->getUserIp($uid); $getIPAddress = $this->getUserIp($uid);
if ($getIPAddress !== $_SERVER['REMOTE_ADDR']) { if ($getIPAddress !== $this->getCurrentIP()) {
$this->log->log("warn", "$username has logged in with a different IP, saved is [$getIPAddress]"); $this->log->log("warn", "$username has logged in with a different IP, saved is [$getIPAddress]");
} }
$setIPAddress = $this->setUserIp($uid, $_SERVER['REMOTE_ADDR']); $setIPAddress = $this->setUserIp($uid, $_SERVER['REMOTE_ADDR']);
@ -883,7 +883,7 @@ public function isAuthenticated($logout=true) {
* @param checkforwarded bool check HTTP_X_FORWARDED_FOR for a valid ip first * @param checkforwarded bool check HTTP_X_FORWARDED_FOR for a valid ip first
* @return string IP address * @return string IP address
*/ */
public function getCurrentIP($trustremote=true, $checkclient=false, $checkforwarded=false) { public function getCurrentIP($trustremote=false, $checkclient=false, $checkforwarded=true) {
$client = (isset($_SERVER['HTTP_CLIENT_IP'])) ? $_SERVER['HTTP_CLIENT_IP'] : false; $client = (isset($_SERVER['HTTP_CLIENT_IP'])) ? $_SERVER['HTTP_CLIENT_IP'] : false;
$fwd = (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : false; $fwd = (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : false;
$remote = (isset($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : @$_SERVER['REMOTE_ADDR']; $remote = (isset($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : @$_SERVER['REMOTE_ADDR'];
@ -893,13 +893,7 @@ public function isAuthenticated($logout=true) {
} else if (strpos($fwd, ',') !== false && !$trustremote && $checkforwarded) { } else if (strpos($fwd, ',') !== false && !$trustremote && $checkforwarded) {
// multiple proxies // multiple proxies
$ips = explode(',', $fwd); $ips = explode(',', $fwd);
$path = array(); return $ips[0];
foreach ($ips as $ip) {
if (filter_var($ip, FILTER_VALIDATE_IP)) {
$path[] = $ip;
}
}
return array_pop($path);
} else if (filter_var($fwd, FILTER_VALIDATE_IP) && !$trustremote && $checkforwarded) { } else if (filter_var($fwd, FILTER_VALIDATE_IP) && !$trustremote && $checkforwarded) {
// single // single
return $fwd; return $fwd;