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

Attempted ipv6 support (untested)

develop
Steve Allison 2013-02-21 12:51:12 +00:00
parent e2797d9b6e
commit 29d069a265
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
defense.php
View File

@ -43,7 +43,9 @@ class defense extends rcube_plugin {
foreach ($array as $value) {
// 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 ($this->isIPv4inCIDR($ip, $value)) { return true; }
if (isIPv6($ip) != isIPv6($value)) { return false; }
if ((!isIPv6($ip) && ($this->isIPv4inCIDR($ip, $value))) { return true; }
if ((isIPv6($ip) && ($this->isIPv6inCIDR($ip, $value))) { return true; }
}
return false;
}
@ -58,6 +60,41 @@ class defense extends rcube_plugin {
list($subnet, $mask) = explode('/', $cidr);
return ((ip2long($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long($subnet));
}
/**
* Convert IPv6 mask to bytearray
*
* @param string subnet mask
* @return string byte array
*/
private function IPv6MaskToByteArray($subnetMask) {
$addr = str_repeat("f", $subnetMask / 4);
switch ($subnetMask % 4) {
case 0:
break;
case 1:
$addr .= "8";
break;
case 2:
$addr .= "c";
break;
case 3:
$addr .= "e";
break;
}
$addr = str_pad($addr, 32, '0');
$addr = pack("H*" , $addr);
return $addr;
}
/**
* Check if IPv6 is within stated CIDR address
*
* @param string subnet mask
* @return string byte array
*/
private function isIPv6inCIDR($address, $subnetAddress, $subnetMask) {
$binMask = IPv6MaskToByteArray($subnetMask);
return ($address & $binMask) == $subnetAddress;
}
/**
* Check string if it is IPv6
*
@ -65,7 +102,7 @@ class defense extends rcube_plugin {
* @return bool
*/
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)
}
/**