From 80ecb1b7aaab47edeb355c3b74a763e940d88179 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 29 Apr 2022 19:51:50 +0200
Subject: xml: T4047: use full string match in the regex validator

---
 interface-definitions/interfaces-wireless.xml.in | 40 ++++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'interface-definitions/interfaces-wireless.xml.in')

diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index db01657eb..eb6107303 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -10,7 +10,7 @@
             <script>cd /sys/class/net; if compgen -G "wlan*" > /dev/null; then ls -d wlan*; fi</script>
           </completionHelp>
           <constraint>
-            <regex>^wlan[0-9]+$</regex>
+            <regex>wlan[0-9]+</regex>
           </constraint>
           <constraintErrorMessage>Wireless interface must be named wlanN</constraintErrorMessage>
           <valueHelp>
@@ -63,7 +63,7 @@
                         <description>Supported channel set width both 20 MHz and 40 MHz with secondary channel below primary channel</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(ht20|ht40\+|ht40-)$</regex>
+                        <regex>(ht20|ht40\+|ht40-)</regex>
                       </constraint>
                       <multi/>
                     </properties>
@@ -113,7 +113,7 @@
                         <description>Set maximum A-MSDU length to 7935 octets</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(3839|7935)$</regex>
+                        <regex>(3839|7935)</regex>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -132,7 +132,7 @@
                         <description>Short GI for 40 MHz</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(20|40)$</regex>
+                        <regex>(20|40)</regex>
                       </constraint>
                       <multi/>
                     </properties>
@@ -152,7 +152,7 @@
                         <description>DYNAMIC Spatial Multiplexing (SM) Power Save</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(static|dynamic)$</regex>
+                        <regex>(static|dynamic)</regex>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -169,7 +169,7 @@
                             <description>Number of spacial streams that can use RX STBC</description>
                           </valueHelp>
                           <constraint>
-                            <regex>^[1-3]+$</regex>
+                            <regex>[1-3]+</regex>
                           </constraint>
                           <constraintErrorMessage>Invalid capability item</constraintErrorMessage>
                         </properties>
@@ -248,7 +248,7 @@
                         <description>Support for operation as multi user beamformee</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(single-user-beamformer|single-user-beamformee|multi-user-beamformer|multi-user-beamformee)$</regex>
+                        <regex>(single-user-beamformer|single-user-beamformee|multi-user-beamformer|multi-user-beamformee)</regex>
                       </constraint>
                       <multi/>
                     </properties>
@@ -334,7 +334,7 @@
                         <description>Station can provide VHT MFB in response to VHT MRQ and unsolicited VHT MFB</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(unsolicited|both)$</regex>
+                        <regex>(unsolicited|both)</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid capability item</constraintErrorMessage>
                     </properties>
@@ -366,7 +366,7 @@
                         <description>ncrease Maximum MPDU length to 11454 octets</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(7991|11454)$</regex>
+                        <regex>(7991|11454)</regex>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -385,7 +385,7 @@
                         <description>Short GI for 160 MHz</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(80|160)$</regex>
+                        <regex>(80|160)</regex>
                       </constraint>
                       <multi/>
                     </properties>
@@ -403,7 +403,7 @@
                             <description>Number of spacial streams that can use RX STBC</description>
                           </valueHelp>
                           <constraint>
-                            <regex>^[1-4]+$</regex>
+                            <regex>[1-4]+</regex>
                           </constraint>
                           <constraintErrorMessage>Invalid capability item</constraintErrorMessage>
                         </properties>
@@ -464,7 +464,7 @@
                 <description>ISO/IEC 3166-1 Country Code</description>
               </valueHelp>
               <constraint>
-                <regex>^[a-z][a-z]$</regex>
+                <regex>[a-z][a-z]</regex>
               </constraint>
               <constraintErrorMessage>Invalid ISO/IEC 3166-1 Country Code</constraintErrorMessage>
             </properties>
@@ -529,7 +529,7 @@
                 <description>MFP enforced</description>
               </valueHelp>
               <constraint>
-                <regex>^(disabled|optional|required)$</regex>
+                <regex>(disabled|optional|required)</regex>
               </constraint>
             </properties>
             <defaultValue>disabled</defaultValue>
@@ -561,7 +561,7 @@
                 <description>802.11ac - 1300 Mbits/sec</description>
               </valueHelp>
               <constraint>
-                <regex>^(a|b|g|n|ac)$</regex>
+                <regex>(a|b|g|n|ac)</regex>
               </constraint>
             </properties>
             <defaultValue>g</defaultValue>
@@ -650,7 +650,7 @@
                         <description>Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)$</regex>
+                        <regex>(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid cipher selection</constraintErrorMessage>
                       <multi/>
@@ -683,7 +683,7 @@
                         <description>Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)$</regex>
+                        <regex>(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid group cipher selection</constraintErrorMessage>
                       <multi/>
@@ -708,7 +708,7 @@
                         <description>Allow both WPA and WPA2</description>
                       </valueHelp>
                       <constraint>
-                        <regex>^(wpa|wpa2|wpa\+wpa2|wpa3)$</regex>
+                        <regex>(wpa|wpa2|wpa\+wpa2|wpa3)</regex>
                       </constraint>
                       <constraintErrorMessage>Unknown WPA mode</constraintErrorMessage>
                     </properties>
@@ -724,7 +724,7 @@
                         <description>Passphrase of at least 8 but not more than 63 printable characters</description>
                       </valueHelp>
                       <constraint>
-                        <regex>.{8,63}$</regex>
+                        <regex>.{8,63}</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid WPA pass phrase, must be 8 to 63 printable characters!</constraintErrorMessage>
                     </properties>
@@ -752,7 +752,7 @@
             <properties>
               <help>Wireless access-point service set identifier (SSID)</help>
               <constraint>
-                <regex>.{1,32}$</regex>
+                <regex>.{1,32}</regex>
               </constraint>
               <constraintErrorMessage>Invalid SSID</constraintErrorMessage>
             </properties>
@@ -776,7 +776,7 @@
                 <description>Passively monitor all packets on the frequency/channel</description>
               </valueHelp>
               <constraint>
-                <regex>^(access-point|station|monitor)$</regex>
+                <regex>(access-point|station|monitor)</regex>
               </constraint>
               <constraintErrorMessage>Type must be access-point, station or monitor</constraintErrorMessage>
             </properties>
-- 
cgit v1.2.3