Fixed ipv6 address validator

Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Oct 6, 2023 · 3c747a5 · 3c747a5
1 parent 5c01583
commit 3c747a5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/....eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/TextFieldValidator.java b/....eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/util/TextFieldValidator.java
@@ -26,7 +26,7 @@
 public class TextFieldValidator {
 
     private static final String IPV4_ADDRESS_REGEX = "\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b";
-    private static final String IPV6_ADDRESS_REGEX = "\\b(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))";
+    private static final String IPV6_ADDRESS_REGEX = "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))";
     private static final ValidationMessages MSGS = GWT.create(ValidationMessages.class);
 
     TextBox Tbox;
@@ -78,7 +78,7 @@ public enum FieldType {
         ALPHANUMERIC("alphanumeric", "^[a-zA-Z0-9_]+$"),
         NUMERIC("numeric", "^[+0-9.]+$"),
         NETWORK_IPV4("ipv4_network", IPV4_ADDRESS_REGEX + "\\/(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b"),
-        NETWORK_IPV6("ipv6_network", IPV6_ADDRESS_REGEX + "\\/(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b"),
+        NETWORK_IPV6("ipv6_network", IPV6_ADDRESS_REGEX + "\\/(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"),
         IPV4_ADDRESS("ipv4_address", IPV4_ADDRESS_REGEX),
         IPV6_ADDRESS("ipv6_address", IPV6_ADDRESS_REGEX),
         PORT("port", "^[0-9]*$"),