nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed variables to reflect content, and improved matching code

Browse Source
This commit is contained in:
Herman van Rink
2009-03-10 13:19:55 +00:00
parent 01dbe95dff
commit e747ae55e9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/ip_allow_deny.lib.php
View File

@@ -28,12 +28,13 @@ function PMA_getIp()
/* Do we trust this IP as a proxy? If yes we will use it's header. */ /* Do we trust this IP as a proxy? If yes we will use it's header. */
if (isset($GLOBALS['cfg']['TrustedProxies'][$direct_ip])) { if (isset($GLOBALS['cfg']['TrustedProxies'][$direct_ip])) {
$proxy_ip = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]);
// the $ checks that the header contains only one IP address $matches = array();
$is_ip = preg_match('|^([0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $proxy_ip, $regs); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture
if ($is_ip && (count($regs) > 0)) { $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches);
if ($is_ip && (count($matches) == 1)) {
// True IP behind a proxy // True IP behind a proxy
return $regs[0]; return $matches[0];
} }
} }