From c455a1f71674300b8a74863ddfe6e551fe8fd252 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Tue, 9 Apr 2024 11:02:58 +0000
Subject: T6214: T6213: change constraint
 <alpha-numeric-hyphen-underscore-dot.xml.i> in order to not allow string
 starting with dot character; use such constraint in firewall group
 definitions.

---
 interface-definitions/firewall.xml.in              | 26 ++++++++++++++--------
 .../alpha-numeric-hyphen-underscore-dot.xml.i      |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index 3219471b1..24e63c5ec 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -56,8 +56,9 @@
             <properties>
               <help>Firewall address-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="address">
@@ -96,7 +97,7 @@
               <constraint>
                 <regex>[a-zA-Z_][a-zA-Z0-9]?[\w\-\.]*</regex>
               </constraint>
-              <constraintErrorMessage>Name of domain-group can only contain alpha-numeric letters, hyphen, underscores and not start with numeric</constraintErrorMessage>
+              <constraintErrorMessage>Name of domain-group can only contain alphanumeric letters, hyphen, underscores and not start with numeric</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="address">
@@ -124,8 +125,9 @@
                 <properties>
                   <help>Firewall dynamic address group</help>
                   <constraint>
-                    <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                    #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
                   </constraint>
+                  <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
                 </properties>
                 <children>
                   #include <include/generic-description.xml.i>
@@ -148,8 +150,9 @@
             <properties>
               <help>Firewall interface-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="interface">
@@ -177,8 +180,9 @@
             <properties>
               <help>Firewall ipv6-address-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="address">
@@ -215,8 +219,9 @@
             <properties>
               <help>Firewall ipv6-network-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               #include <include/generic-description.xml.i>
@@ -248,8 +253,9 @@
             <properties>
               <help>Firewall mac-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               #include <include/generic-description.xml.i>
@@ -281,8 +287,9 @@
             <properties>
               <help>Firewall network-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               #include <include/generic-description.xml.i>
@@ -314,8 +321,9 @@
             <properties>
               <help>Firewall port-group</help>
               <constraint>
-                <regex>[a-zA-Z0-9][\w\-\.]*</regex>
+                #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
               </constraint>
+              <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
               #include <include/generic-description.xml.i>
diff --git a/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i b/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i
index 7aeb85260..34c94e53c 100644
--- a/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i
+++ b/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from constraint/alpha-numeric-hyphen-underscore-dot.xml.i -->
-<regex>[-_a-zA-Z0-9.]+</regex>
+<regex>[-_a-zA-Z0-9][\w\-\.\+]*</regex>
 <!-- include end -->
-- 
cgit v1.2.3