Update old IpFilter class to call the new class internally

This commit is contained in:
Kijin Sung 2016-02-02 09:15:07 +09:00
parent 409ab63276
commit b47abe8d12

View file

@ -6,87 +6,29 @@ class IpFilter
public function filter($ip_list, $ip = NULL)
{
if(!$ip) $ip = $_SERVER['REMOTE_ADDR'];
$long_ip = ip2long($ip);
foreach($ip_list as $filter_ip)
{
$range = explode('-', $filter_ip);
if(!$range[1]) // single address type
{
$star_pos = strpos($filter_ip, '*');
if($star_pos !== FALSE ) // wild card exist
{
if(strncmp($filter_ip, $ip, $star_pos)===0) return true;
}
else if(strcmp($filter_ip, $ip)===0)
{
return true;
}
}
else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
foreach($ip_list as $filter)
{
if(Rhymix\Framework\IpFilter::inRange($ip, $filter))
{
return true;
}
}
return false;
}
/* public function filter2($ip_list, $ip)
{
$long_ip = ip2long($ip);
foreach($ip_list as $filter_ip)
{
$range = explode('-', $filter_ip);
if(!$range[1]) // single address type
{
$range[1] = str_replace('*', '255', $range[0]);
$range[0] = str_replace('*', '0', $range[0]);
}
if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
{
return true;
}
}
return false;
} */
public function validate($ip_list = array())
{
/* 사용가능한 표현
192.168.2.10 - 4자리의 정확한 ip주소
192.168.*.* - 와일드카드(*) 사용된 4자리의 ip주소, a클래스에는 와일드카드 사용불가,
와일드카드 이후의 아이피주소 허용(, filter() 경우 와일드카드 이후 주소는 무시됨
192.168.1.1-192.168.1.10 - '-' 구분된 정확한 4자리의 ip주소 2
*/
$regex = "/^
(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)
(?:
(?:
(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}
(?:-(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){1}
(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}
)
|
(?:
(?:\.(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|\*)){3}
)
)
$/";
$regex = str_replace(array("\r\n", "\n", "\r","\t"," "), '', $regex);
foreach($ip_list as $i => $ip)
foreach($ip_list as $filter)
{
preg_match($regex, $ip, $matches);
if(!count($matches)) return false;
if(!Rhymix\Framework\IpFilter::validateRange($filter))
{
return false;
}
}
return true;
}
}
/* End of file : IpFilter.class.php */
/* Location: ./classes/security/IpFilter.class.php */