diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-26 19:30:46 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-12-26 19:30:48 +0100 |
commit | e71592e0f8e6139ce6aebac005c1426c87bd1149 (patch) | |
tree | 9f437c7ca0f745371f8937cf0ce233fd23ef368a /interface-definitions | |
parent | 8532f668f70c3c0c3f3a6dc5d6cddcd73b7023e1 (diff) | |
download | vyos-1x-e71592e0f8e6139ce6aebac005c1426c87bd1149.tar.gz vyos-1x-e71592e0f8e6139ce6aebac005c1426c87bd1149.zip |
xml: remove leading carrot (^) from regex syntax
... as the carrot is applied automatically when reading in the XML
definition. Auto replaced by:
$ find interface-definitions -type f | xargs sed -i 's/regex>^/regex>/'
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/dns-domain-name.xml.in | 6 | ||||
-rw-r--r-- | interface-definitions/flow-accounting-conf.xml.in | 4 | ||||
-rw-r--r-- | interface-definitions/https.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/include/interface-description.xml.i | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in | 4 | ||||
-rw-r--r-- | interface-definitions/ipoe-server.xml.in | 6 | ||||
-rw-r--r-- | interface-definitions/l2tp-server.xml.in | 8 | ||||
-rw-r--r-- | interface-definitions/lldp.xml.in | 10 | ||||
-rw-r--r-- | interface-definitions/pptp-server.xml.in | 4 | ||||
-rw-r--r-- | interface-definitions/service-pppoe.xml.in | 12 | ||||
-rw-r--r-- | interface-definitions/snmp.xml.in | 28 | ||||
-rw-r--r-- | interface-definitions/ssh.xml.in | 8 | ||||
-rw-r--r-- | interface-definitions/sstp.xml.in | 4 | ||||
-rw-r--r-- | interface-definitions/system-syslog.xml.in | 12 |
14 files changed, 55 insertions, 55 deletions
diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index c16f0b02a..eeaa5b2c1 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -48,7 +48,7 @@ <properties> <help>DNS domain completion order</help> <constraint> - <regex>^[-a-zA-Z0-9.]+$</regex> + <regex>[-a-zA-Z0-9.]+$</regex> </constraint> <constraintErrorMessage>Invalid domain name</constraintErrorMessage> <multi/> @@ -74,7 +74,7 @@ <properties> <help>Host name for static address mapping</help> <constraint> - <regex>^[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$</regex> + <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$</regex> </constraint> <constraintErrorMessage>invalid hostname</constraintErrorMessage> </properties> @@ -83,7 +83,7 @@ <properties> <help>Alias for this address</help> <constraint> - <regex>^.{1,63}$</regex> + <regex>.{1,63}$</regex> </constraint> <constraintErrorMessage>invalid alias hostname, needs to be between 1 and 63 charactes</constraintErrorMessage> <multi /> diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in index b0a087796..5cf866b8e 100644 --- a/interface-definitions/flow-accounting-conf.xml.in +++ b/interface-definitions/flow-accounting-conf.xml.in @@ -156,7 +156,7 @@ <description>NetFlow engine-id for v9 / IPFIX</description> </valueHelp> <constraint> - <regex>^(\d|[1-9]\d{1,8}|[1-3]\d{9}|4[01]\d{8}|42[0-8]\d{7}|429[0-3]\d{6}|4294[0-8]\d{5}|42949[0-5]\d{4}|429496[0-6]\d{3}|4294967[01]\d{2}|42949672[0-8]\d|429496729[0-5])$|^(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]):(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$</regex> + <regex>(\d|[1-9]\d{1,8}|[1-3]\d{9}|4[01]\d{8}|42[0-8]\d{7}|429[0-3]\d{6}|4294[0-8]\d{5}|42949[0-5]\d{4}|429496[0-6]\d{3}|4294967[01]\d{2}|42949672[0-8]\d|429496729[0-5])$|^(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]):(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$</regex> </constraint> </properties> </leafNode> @@ -375,7 +375,7 @@ </valueHelp> <constraint> <validator name="ipv4-address"/> - <regex>^auto$</regex> + <regex>auto$</regex> </constraint> </properties> </leafNode> diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in index 923aac811..4c91bbd94 100644 --- a/interface-definitions/https.xml.in +++ b/interface-definitions/https.xml.in @@ -27,7 +27,7 @@ <constraint> <validator name="ipv4-address"/> <validator name="ipv6-address"/> - <regex>^\*$</regex> + <regex>\*$</regex> </constraint> </properties> <children> diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i index 6356888da..7a7a37871 100644 --- a/interface-definitions/include/interface-description.xml.i +++ b/interface-definitions/include/interface-description.xml.i @@ -2,7 +2,7 @@ <properties> <help>Interface description</help> <constraint> - <regex>^.{1,256}$</regex> + <regex>.{1,256}$</regex> </constraint> <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage> </properties> diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index bbe9a5d03..74319f705 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -75,7 +75,7 @@ <properties> <help>base64 encoded public key</help> <constraint> - <regex>^[0-9a-zA-Z\+/]{43}=$</regex> + <regex>[0-9a-zA-Z\+/]{43}=$</regex> </constraint> <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage> </properties> @@ -84,7 +84,7 @@ <properties> <help>base64 encoded preshared key</help> <constraint> - <regex>^[0-9a-zA-Z\+/]{43}=$</regex> + <regex>[0-9a-zA-Z\+/]{43}=$</regex> </constraint> <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage> </properties> diff --git a/interface-definitions/ipoe-server.xml.in b/interface-definitions/ipoe-server.xml.in index 5fee02614..f683ac5f4 100644 --- a/interface-definitions/ipoe-server.xml.in +++ b/interface-definitions/ipoe-server.xml.in @@ -23,7 +23,7 @@ <list>L2 L3</list> </completionHelp> <constraint> - <regex>^(L2|L3)</regex> + <regex>(L2|L3)</regex> </constraint> <valueHelp> <format>L2</format> @@ -42,7 +42,7 @@ <list>shared vlan</list> </completionHelp> <constraint> - <regex>^(shared|vlan)</regex> + <regex>(shared|vlan)</regex> </constraint> <valueHelp> <format>shared</format> @@ -196,7 +196,7 @@ <list>local radius noauth</list> </completionHelp> <constraint> - <regex>^(local|radius|noauth)</regex> + <regex>(local|radius|noauth)</regex> </constraint> <valueHelp> <format>local</format> diff --git a/interface-definitions/l2tp-server.xml.in b/interface-definitions/l2tp-server.xml.in index 4e3a49b24..98c17b8b2 100644 --- a/interface-definitions/l2tp-server.xml.in +++ b/interface-definitions/l2tp-server.xml.in @@ -120,7 +120,7 @@ <description>Use X.509 certificate for IPsec authentication</description> </valueHelp> <constraint> - <regex>^(pre-shared-secret|x509)</regex> + <regex>(pre-shared-secret|x509)</regex> </constraint> <completionHelp> <list>pre-shared-secret x509</list> @@ -342,7 +342,7 @@ <description>Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2].</description> </valueHelp> <constraint> - <regex>^(pap|chap|mschap|mschap-v2)</regex> + <regex>(pap|chap|mschap|mschap-v2)</regex> </constraint> <completionHelp> <list>pap chap mschap mschap-v2</list> @@ -366,7 +366,7 @@ <description>ask client for mppe, if it rejects drop connection</description> </valueHelp> <constraint> - <regex>^(deny|prefer|require)</regex> + <regex>(deny|prefer|require)</regex> </constraint> <completionHelp> <list>deny prefer require</list> @@ -385,7 +385,7 @@ <description>Use a RADIUS server to autenticate users</description> </valueHelp> <constraint> - <regex>^(local|radius)</regex> + <regex>(local|radius)</regex> </constraint> <completionHelp> <list>local radius</list> diff --git a/interface-definitions/lldp.xml.in b/interface-definitions/lldp.xml.in index 774c15116..f95ffb4df 100644 --- a/interface-definitions/lldp.xml.in +++ b/interface-definitions/lldp.xml.in @@ -142,7 +142,7 @@ <help>Civic address value for ca-type [REQUIRED]</help> <constraintErrorMessage>ca-value must be less than 256 characters</constraintErrorMessage> <constraint> - <regex>^[A-Za-z0-9\ \-\_\.\,]{0,255}$</regex> + <regex>[A-Za-z0-9\ \-\_\.\,]{0,255}$</regex> </constraint> </properties> </leafNode> @@ -157,7 +157,7 @@ </valueHelp> <constraintErrorMessage>country-code must be 2 characters</constraintErrorMessage> <constraint> - <regex>^[a-zA-Z]{2}$</regex> + <regex>[a-zA-Z]{2}$</regex> </constraint> </properties> </leafNode> @@ -201,7 +201,7 @@ </completionHelp> <constraintErrorMessage>Datum should be WGS84, NAD83, or MLLW</constraintErrorMessage> <constraint> - <regex>^(WGS84|NAD83|MLLW)$</regex> + <regex>(WGS84|NAD83|MLLW)$</regex> </constraint> </properties> </leafNode> @@ -214,7 +214,7 @@ </valueHelp> <constraintErrorMessage>Latitude should be a number followed by S or N</constraintErrorMessage> <constraint> - <regex>^(\d+)(\.\d+)?[nNsS]$</regex> + <regex>(\d+)(\.\d+)?[nNsS]$</regex> </constraint> </properties> </leafNode> @@ -227,7 +227,7 @@ </valueHelp> <constraintErrorMessage>Longiture should be a number followed by E or W</constraintErrorMessage> <constraint> - <regex>^(\d+)(\.\d+)?[eEwW]$</regex> + <regex>(\d+)(\.\d+)?[eEwW]$</regex> </constraint> </properties> </leafNode> diff --git a/interface-definitions/pptp-server.xml.in b/interface-definitions/pptp-server.xml.in index 3b4ea4f17..cbcdc8e28 100644 --- a/interface-definitions/pptp-server.xml.in +++ b/interface-definitions/pptp-server.xml.in @@ -155,7 +155,7 @@ <description>ask client for mppe, if it rejects drop connection</description> </valueHelp> <constraint> - <regex>^(deny|prefer|require)</regex> + <regex>(deny|prefer|require)</regex> </constraint> <completionHelp> <list>deny prefer require</list> @@ -174,7 +174,7 @@ <description>Use a RADIUS server to autenticate users</description> </valueHelp> <constraint> - <regex>^(local|radius)</regex> + <regex>(local|radius)</regex> </constraint> <completionHelp> <list>local radius</list> diff --git a/interface-definitions/service-pppoe.xml.in b/interface-definitions/service-pppoe.xml.in index 4951f656b..20c206d21 100644 --- a/interface-definitions/service-pppoe.xml.in +++ b/interface-definitions/service-pppoe.xml.in @@ -25,7 +25,7 @@ <properties> <help>Access concentrator name</help> <constraint> - <regex>^[a-zA-Z0-9]{1,100}</regex> + <regex>[a-zA-Z0-9]{1,100}</regex> </constraint> <constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage> </properties> @@ -119,7 +119,7 @@ <description>Use a RADIUS server to autenticate users</description> </valueHelp> <constraint> - <regex>^(local|radius)</regex> + <regex>(local|radius)</regex> </constraint> <completionHelp> <list>local radius</list> @@ -412,7 +412,7 @@ <properties> <help>Acceptable rate of connections (e.g. 1/min, 60/sec)</help> <constraint> - <regex>^[0-9]+\/(min|sec)$</regex> + <regex>[0-9]+\/(min|sec)$</regex> </constraint> <constraintErrorMessage>illegal value</constraintErrorMessage> </properties> @@ -433,7 +433,7 @@ <properties> <help>Service name</help> <constraint> - <regex>^[a-zA-Z0-9\-]{1,100}</regex> + <regex>[a-zA-Z0-9\-]{1,100}</regex> </constraint> <constraintErrorMessage>servicename can contain aplhanumerical characters and dashes only (max. 100)</constraintErrorMessage> </properties> @@ -541,7 +541,7 @@ <properties> <help>IPv4 (IPCP) negotiation algorithm</help> <constraint> - <regex>^(deny|allow|prefer|require)</regex> + <regex>(deny|allow|prefer|require)</regex> </constraint> <constraintErrorMessage>invalid value</constraintErrorMessage> <valueHelp> @@ -566,7 +566,7 @@ <properties> <help>IPv6 (IPCP6) negotiation algorithm</help> <constraint> - <regex>^(deny|allow|prefer|require)</regex> + <regex>(deny|allow|prefer|require)</regex> </constraint> <constraintErrorMessage>invalid value</constraintErrorMessage> <valueHelp> diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in index bdfbd4ab6..91f1b8d71 100644 --- a/interface-definitions/snmp.xml.in +++ b/interface-definitions/snmp.xml.in @@ -13,7 +13,7 @@ <properties> <help>Community name [REQUIRED]</help> <constraint> - <regex>^[a-zA-Z0-9\-_]{1,100}</regex> + <regex>[a-zA-Z0-9\-_]{1,100}</regex> </constraint> <constraintErrorMessage>Community string is limited to alphanumerical characters only with a total lenght of 100</constraintErrorMessage> </properties> @@ -183,7 +183,7 @@ <properties> <help>Specifies the EngineID that uniquely identify an agent (e.g. 0xff42)</help> <constraint> - <regex>^(0x){0,1}([0-9a-f][0-9a-f]){1,18}$</regex> + <regex>(0x){0,1}([0-9a-f][0-9a-f]){1,18}$</regex> </constraint> <constraintErrorMessage>ID must contain an even number (from 2 to 36) of hex digits</constraintErrorMessage> </properties> @@ -272,7 +272,7 @@ <properties> <help>Defines the encrypted key for authentication</help> <constraint> - <regex>^0x[0-9a-f]*$</regex> + <regex>0x[0-9a-f]*$</regex> </constraint> <constraintErrorMessage>Key must start from '0x' and contain hex digits</constraintErrorMessage> </properties> @@ -281,7 +281,7 @@ <properties> <help>Defines the clear text key for authentication</help> <constraint> - <regex>^.{8,}$</regex> + <regex>.{8,}$</regex> </constraint> <constraintErrorMessage>Key must contain 8 or more characters</constraintErrorMessage> </properties> @@ -329,7 +329,7 @@ <properties> <help>Defines the encrypted key for privacy protocol</help> <constraint> - <regex>^0x[0-9a-f]*$</regex> + <regex>0x[0-9a-f]*$</regex> </constraint> <constraintErrorMessage>Key must start from '0x' and contain hex digits</constraintErrorMessage> </properties> @@ -338,7 +338,7 @@ <properties> <help>Defines the clear text key for privacy protocol</help> <constraint> - <regex>^.{8,}$</regex> + <regex>.{8,}$</regex> </constraint> <constraintErrorMessage>Key must contain 8 or more characters</constraintErrorMessage> </properties> @@ -416,7 +416,7 @@ <properties> <help>Specifies the user with name username</help> <constraint> - <regex>^[^\(\)\|\-]+$</regex> + <regex>[^\(\)\|\-]+$</regex> </constraint> <constraintErrorMessage>Illegal characters in name</constraintErrorMessage> </properties> @@ -430,7 +430,7 @@ <properties> <help>Defines the encrypted key for authentication</help> <constraint> - <regex>^0x[0-9a-f]*$</regex> + <regex>0x[0-9a-f]*$</regex> </constraint> <constraintErrorMessage>Key must start from '0x' and contain hex digits</constraintErrorMessage> </properties> @@ -439,7 +439,7 @@ <properties> <help>Defines the clear text key for authentication</help> <constraint> - <regex>^.{8,}$</regex> + <regex>.{8,}$</regex> </constraint> <constraintErrorMessage>Key must contain 8 or more characters</constraintErrorMessage> </properties> @@ -502,7 +502,7 @@ <properties> <help>Defines the encrypted key for privacy protocol</help> <constraint> - <regex>^0x[0-9a-f]*$</regex> + <regex>0x[0-9a-f]*$</regex> </constraint> <constraintErrorMessage>Key must start from '0x' and contain hex digits</constraintErrorMessage> </properties> @@ -511,7 +511,7 @@ <properties> <help>Defines the clear text key for privacy protocol</help> <constraint> - <regex>^.{8,}$</regex> + <regex>.{8,}$</regex> </constraint> <constraintErrorMessage>Key must contain 8 or more characters</constraintErrorMessage> </properties> @@ -543,7 +543,7 @@ <properties> <help>Specifies the view with name viewname</help> <constraint> - <regex>^[^\(\)\|\-]+$</regex> + <regex>[^\(\)\|\-]+$</regex> </constraint> <constraintErrorMessage>Illegal characters in name</constraintErrorMessage> </properties> @@ -552,7 +552,7 @@ <properties> <help>Specifies the oid</help> <constraint> - <regex>^[0-9]+(\.[0-9]+)*$</regex> + <regex>[0-9]+(\.[0-9]+)*$</regex> </constraint> <constraintErrorMessage>OID must start from a number</constraintErrorMessage> </properties> @@ -566,7 +566,7 @@ <properties> <help>Defines a bit-mask that is indicating which subidentifiers of the associated subtree OID should be regarded as significant</help> <constraint> - <regex>^[0-9a-f]{2}([\.:][0-9a-f]{2})*$</regex> + <regex>[0-9a-f]{2}([\.:][0-9a-f]{2})*$</regex> </constraint> <constraintErrorMessage>MASK is a list of hex octets, separated by '.' or ':'</constraintErrorMessage> </properties> diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in index 8dea94d05..ea4202195 100644 --- a/interface-definitions/ssh.xml.in +++ b/interface-definitions/ssh.xml.in @@ -25,7 +25,7 @@ <properties> <help>Allow members of a group to login</help> <constraint> - <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex> + <regex>[a-z_][a-z0-9_-]{1,31}[$]?</regex> </constraint> <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage> <multi/> @@ -35,7 +35,7 @@ <properties> <help>Allow specific users to login</help> <constraint> - <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex> + <regex>[a-z_][a-z0-9_-]{1,31}[$]?</regex> </constraint> <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage> <multi/> @@ -52,7 +52,7 @@ <properties> <help>Disallow members of a group to login</help> <constraint> - <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex> + <regex>[a-z_][a-z0-9_-]{1,31}[$]?</regex> </constraint> <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage> <multi/> @@ -62,7 +62,7 @@ <properties> <help>Disallow specific users to login</help> <constraint> - <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex> + <regex>[a-z_][a-z0-9_-]{1,31}[$]?</regex> </constraint> <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage> <multi/> diff --git a/interface-definitions/sstp.xml.in b/interface-definitions/sstp.xml.in index 290b45a98..9316db6fe 100644 --- a/interface-definitions/sstp.xml.in +++ b/interface-definitions/sstp.xml.in @@ -78,7 +78,7 @@ <description>Use a RADIUS server to autenticate users</description> </valueHelp> <constraint> - <regex>^(local|radius)</regex> + <regex>(local|radius)</regex> </constraint> <completionHelp> <list>local radius</list> @@ -105,7 +105,7 @@ <description>Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2].</description> </valueHelp> <constraint> - <regex>^(pap|chap|mschap|mschap-v2)</regex> + <regex>(pap|chap|mschap|mschap-v2)</regex> </constraint> <completionHelp> <list>pap chap mschap mschap-v2</list> diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in index cce79a4c2..2079ec0ea 100644 --- a/interface-definitions/system-syslog.xml.in +++ b/interface-definitions/system-syslog.xml.in @@ -12,7 +12,7 @@ <properties> <help>Logging to specific terminal of given user</help> <constraint> - <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex> + <regex>[a-z_][a-z0-9_-]{1,31}[$]?</regex> </constraint> <constraintErrorMessage>illegal characters in user</constraintErrorMessage> <valueHelp> @@ -394,7 +394,7 @@ <properties> <help>Number of saved files (default is 5)</help> <constraint> - <regex>^[0-9]+</regex> + <regex>[0-9]+</regex> </constraint> <constraintErrorMessage>illegal characters in number of files</constraintErrorMessage> </properties> @@ -403,7 +403,7 @@ <properties> <help>Size of log files (in kbytes, default is 256)</help> <constraint> - <regex>^[0-9]+</regex> + <regex>[0-9]+</regex> </constraint> <constraintErrorMessage>illegal characters in size</constraintErrorMessage> </properties> @@ -591,7 +591,7 @@ <properties> <help>Logging to a file</help> <constraint> - <regex>^[a-zA-Z0-9\-_.]{1,255}</regex> + <regex>[a-zA-Z0-9\-_.]{1,255}</regex> </constraint> <constraintErrorMessage>illegal characters in filename or filename longer than 255 characters</constraintErrorMessage> </properties> @@ -605,7 +605,7 @@ <properties> <help>Number of saved files (default is 5)</help> <constraint> - <regex>^[0-9]+</regex> + <regex>[0-9]+</regex> </constraint> <constraintErrorMessage>illegal characters in number of files</constraintErrorMessage> </properties> @@ -614,7 +614,7 @@ <properties> <help>Size of log files (in kbytes, default is 256)</help> <constraint> - <regex>^[0-9]+</regex> + <regex>[0-9]+</regex> </constraint> <constraintErrorMessage>illegal characters in size</constraintErrorMessage> </properties> |