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

remove code for checking ipv6 mapped ipv4 notation

Browse Source
This commit is contained in:
Pascal
2019-10-28 17:27:39 +01:00
parent 9689afc759
commit 5c11eecbd7
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,12 +88,9 @@ class Validate
* @param $address * @param $address
* *
* @return bool * @return bool
* @thx https://stackoverflow.com/a/13677565/3020926
*/ */
public static function is_ipv6($address) { public static function is_ipv6($address) {
$ipv4_mapped_ipv6 = strpos($address, "::ffff:"); return filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
return (strpos($address, ":") !== FALSE) &&
($ipv4_mapped_ipv6 === FALSE || $ipv4_mapped_ipv6 != 0);
} }
/** /**
@@ -129,7 +126,7 @@ class Validate
if(strlen($ip_cidr[1]) <= 2 && in_array((int)$ip_cidr[1], array_values(range(1, 32)), TRUE) === false) { if(strlen($ip_cidr[1]) <= 2 && in_array((int)$ip_cidr[1], array_values(range(1, 32)), TRUE) === false) {
\Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception); \Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception);
} }
if ($cidr_as_netmask && self::is_ipv6($ip)) { if ($cidr_as_netmask && self::is_ipv6($ip_cidr[0])) {
//MySQL does not handle CIDR of IPv6 addresses, return error //MySQL does not handle CIDR of IPv6 addresses, return error
\Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception); \Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception);
} }