ukamnya
/
roundcube-defense
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add IPv4 sanitation check

develop
Steve Allison 2013-02-21 13:17:40 +00:00
parent 29d069a265
commit 8680b42ed6
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
defense.php
View File

@ -31,6 +31,17 @@ class defense extends rcube_plugin {
// Remote client IP address // Remote client IP address
private $ipaddr; private $ipaddr;
// Logfile
private $logfile = 'defense.log';
/**
* Output text to log file: $this->logfile
*
* @param string text for log
*/
private function debug($string) {
write_log($this->logfile, $this->ipaddr . " # " . $string);
}
/** /**
* Check if IP is matched against all IPs in array, * Check if IP is matched against all IPs in array,
* including CIDR matches * including CIDR matches
@ -43,8 +54,9 @@ class defense extends rcube_plugin {
foreach ($array as $value) { foreach ($array as $value) {
// If no slash '/' then its not a CIDR address and we can just string match // If no slash '/' then its not a CIDR address and we can just string match
if ((strpos($value, '/') === false) && (strcmp($ip, $value) == 0)) { return true; } if ((strpos($value, '/') === false) && (strcmp($ip, $value) == 0)) { return true; }
if (isIPv6($ip) != isIPv6($value)) { return false; } if ((isIPv6($ip)) && (!isIPv6($value))) { return false; }
if ((!isIPv6($ip) && ($this->isIPv4inCIDR($ip, $value))) { return true; } if ((isIPv4($value)) && (!isIPv4($ip))) { return false; }
if ((isIPv4($ip) && ($this->isIPv4inCIDR($ip, $value))) { return true; }
if ((isIPv6($ip) && ($this->isIPv6inCIDR($ip, $value))) { return true; } if ((isIPv6($ip) && ($this->isIPv6inCIDR($ip, $value))) { return true; }
} }
return false; return false;
@ -104,7 +116,15 @@ class defense extends rcube_plugin {
private function isIPv6($ip) { private function isIPv6($ip) {
return (((!preg_match('/^[\.\/:0-9a-f]+$/', strtolower($ip))) || (substr_count($ip, ':') < 2)) ? true : false) return (((!preg_match('/^[\.\/:0-9a-f]+$/', strtolower($ip))) || (substr_count($ip, ':') < 2)) ? true : false)
} }
/**
* Check string if it is IPv6
*
* @param string ip address
* @return bool
*/
private function isIPv4($ip) {
return ((preg_match('/^([0-9]{1,3}\.){3}[0-9]{1,3}(\/[0-9]{1,2})?$/', $ip)) ? true : false)
}
/** /**
* Constructor, initialization * Constructor, initialization
* *