Add modified version of user https://github.com/bcyrill patch that requires a IPv6 literal when used with a port.

1 files changed, 12 insertions, 1 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index c9fe428..525ad8d 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -443,13 +443,24 @@ function is_ipaddrv4($ipaddr) {
 		return false;
 }
 
+
+/* returns true if $ipaddr is a valid literal IPv6 address */
+function is_literalipaddrv6($ipaddr) {
+	if(preg_match("/\[([0-9a-f:]+)\]/i", $ipaddr, $match))
+		$ipaddr = $match[1];
+	else
+		return false;
+
+	return is_ipaddrv6($ipaddr);
+}
+
 function is_ipaddrwithport($ipport) {
 	$parts = explode(":", $ipport);
 	$port = array_pop($parts);
 	if (count($parts) == 1) {
 		return is_ipaddrv4($parts[0]) && is_port($port);
 	} elseif (count($parts) > 1) {
-		return is_ipaddrv6(implode(":", $parts)) && is_port($port);
+		return is_literalipaddrv6(implode(":", $parts)) && is_port($port);
 	} else {
 		return false;
 	}