maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

check if ipv6 first

Browse Source
This commit is contained in:
Pascal
2019-10-28 14:07:31 +01:00
parent 83e932b068
commit e8d67f9711
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Froxlor/Validate/Validate.php
View File

@@ -82,6 +82,20 @@ class Validate
return implode ('.', $netmask); return implode ('.', $netmask);
} }
/**
* Checks if an $address (IP) is IPv6
*
* @param $address
*
* @return bool
* @thx https://stackoverflow.com/a/13677565/3020926
*/
public static function is_ipv6($address) {
$ipv4_mapped_ipv6 = strpos($address, "::ffff:");
return (strpos($address, ":") !== FALSE) &&
($ipv4_mapped_ipv6 === FALSE || $ipv4_mapped_ipv6 != 0);
}
/** /**
* Checks whether it is a valid ip * Checks whether it is a valid ip
* *
@@ -107,9 +121,11 @@ class Validate
$org_ip = $ip; $org_ip = $ip;
$ip_cidr = explode("/", $ip); $ip_cidr = explode("/", $ip);
if (count($ip_cidr) === 2) { if (count($ip_cidr) === 2) {
if (self::is_ipv6($ip)) {
//MySQL does not handle CIDR of IPv6 addresses, return error //MySQL does not handle CIDR of IPv6 addresses, return error
if (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { if (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
\Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception); \Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception);
}
} }
$ip = $ip_cidr[0]; $ip = $ip_cidr[0];
if (strlen($ip_cidr[1]) <= 2) { if (strlen($ip_cidr[1]) <= 2) {