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

Merge remote-tracking branch 'origin/pull/12389'

Browse Source
This commit is contained in:
Michal Čihař 2016-07-29 10:48:32 +02:00
commit 25b4d840fb
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/ip_allow_deny.lib.php
View File

@ -35,14 +35,11 @@ function PMA_getIp()
$matches = array();
// the $ checks that the header contains only one IP address,
// ?: makes sure the () don't capture
$is_ip = preg_match(
'|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|',
$trusted_header_value, $matches
);
$is_ip = (filter_var($trusted_header_value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || filter_var($trusted_header_value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4));
if ($is_ip && (count($matches) == 1)) {
if ($is_ip) {
// True IP behind a proxy
return $matches[0];
return $trusted_header_value;
}
/* Return true IP */