From 80ecb1b7aaab47edeb355c3b74a763e940d88179 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 29 Apr 2022 19:51:50 +0200 Subject: xml: T4047: use full string match in the regex validator --- interface-definitions/containers.xml.in | 10 ++--- interface-definitions/dhcp-relay.xml.in | 2 +- interface-definitions/dhcp-server.xml.in | 6 +-- interface-definitions/dns-domain-name.xml.in | 6 +-- interface-definitions/dns-dynamic.xml.in | 4 +- interface-definitions/dns-forwarding.xml.in | 34 ++++++++-------- interface-definitions/firewall.xml.in | 40 +++++++++---------- interface-definitions/flow-accounting-conf.xml.in | 4 +- interface-definitions/high-availability.xml.in | 8 ++-- interface-definitions/https.xml.in | 2 +- interface-definitions/igmp-proxy.xml.in | 2 +- .../include/accel-ppp/auth-mode.xml.i | 2 +- .../include/accel-ppp/auth-protocols.xml.i | 2 +- .../include/accel-ppp/ppp-mppe.xml.i | 2 +- .../include/accel-ppp/ppp-options-ipv4.xml.i | 2 +- .../include/accel-ppp/ppp-options-ipv6.xml.i | 2 +- .../include/bgp/afi-ipv4-prefix-list.xml.i | 4 +- .../include/bgp/afi-ipv6-prefix-list.xml.i | 4 +- interface-definitions/include/bgp/afi-label.xml.i | 2 +- interface-definitions/include/bgp/afi-rd.xml.i | 2 +- .../include/bgp/afi-route-map-export-import.xml.i | 4 +- .../bgp/neighbor-afi-ipv4-ipv6-common.xml.i | 8 ++-- .../include/bgp/neighbor-graceful-restart.xml.i | 2 +- .../include/bgp/protocol-common-config.xml.i | 4 +- interface-definitions/include/bgp/remote-as.xml.i | 2 +- .../firewall/action-accept-drop-reject.xml.i | 2 +- .../include/firewall/action.xml.i | 2 +- .../include/firewall/common-rule.xml.i | 22 +++++------ .../include/firewall/icmp-type-name.xml.i | 2 +- .../include/firewall/icmpv6-type-name.xml.i | 2 +- .../include/firewall/name-default-action.xml.i | 2 +- .../include/interface/address-ipv4-ipv6-dhcp.xml.i | 2 +- .../include/interface/adjust-mss.xml.i | 2 +- .../include/interface/description.xml.i | 2 +- .../include/interface/parameters-flowlabel.xml.i | 2 +- .../include/interface/source-validation.xml.i | 2 +- .../include/interface/vif-s.xml.i | 2 +- interface-definitions/include/interface/vif.xml.i | 4 +- .../include/ipsec/local-address.xml.i | 2 +- .../include/nat-translation-options.xml.i | 4 +- .../include/ospf/authentication.xml.i | 4 +- .../include/ospf/protocol-common-config.xml.i | 14 +++---- .../include/ospfv3/protocol-common-config.xml.i | 2 +- interface-definitions/include/policy/action.xml.i | 2 +- .../include/policy/route-common-rule-ipv6.xml.i | 14 +++---- .../include/policy/route-common-rule.xml.i | 12 +++--- .../include/policy/route-rule-action.xml.i | 2 +- interface-definitions/include/route-map.xml.i | 2 +- .../include/routing-passive-interface.xml.i | 2 +- .../include/snmp/access-mode.xml.i | 2 +- .../include/snmp/authentication-type.xml.i | 2 +- .../include/snmp/privacy-type.xml.i | 2 +- interface-definitions/include/snmp/protocol.xml.i | 2 +- interface-definitions/include/ssh-user.xml.i | 2 +- .../include/static/static-route-vrf.xml.i | 2 +- .../include/vpn-ipsec-encryption.xml.i | 2 +- interface-definitions/include/vpn-ipsec-hash.xml.i | 2 +- .../include/webproxy-url-filtering.xml.i | 2 +- interface-definitions/interfaces-bonding.xml.in | 8 ++-- interface-definitions/interfaces-bridge.xml.in | 2 +- interface-definitions/interfaces-dummy.xml.in | 2 +- interface-definitions/interfaces-ethernet.xml.in | 6 +-- interface-definitions/interfaces-geneve.xml.in | 2 +- interface-definitions/interfaces-l2tpv3.xml.in | 4 +- interface-definitions/interfaces-loopback.xml.in | 2 +- interface-definitions/interfaces-macsec.xml.in | 8 ++-- interface-definitions/interfaces-openvpn.xml.in | 22 +++++------ interface-definitions/interfaces-pppoe.xml.in | 4 +- .../interfaces-pseudo-ethernet.xml.in | 4 +- interface-definitions/interfaces-tunnel.xml.in | 10 ++--- interface-definitions/interfaces-vti.xml.in | 2 +- interface-definitions/interfaces-vxlan.xml.in | 2 +- interface-definitions/interfaces-wireguard.xml.in | 10 ++--- interface-definitions/interfaces-wireless.xml.in | 40 +++++++++---------- interface-definitions/interfaces-wwan.xml.in | 2 +- interface-definitions/nat.xml.in | 2 +- interface-definitions/nat66.xml.in | 2 +- interface-definitions/netns.xml.in | 2 +- interface-definitions/policy-route.xml.in | 4 +- interface-definitions/policy.xml.in | 28 ++++++------- interface-definitions/protocols-bfd.xml.in | 2 +- interface-definitions/protocols-nhrp.xml.in | 4 +- interface-definitions/protocols-rip.xml.in | 4 +- .../service-ids-ddos-protection.xml.in | 2 +- .../service_conntrack-sync.xml.in | 4 +- .../service_console-server.xml.in | 6 +-- interface-definitions/service_ipoe-server.xml.in | 6 +-- .../service_monitoring_telegraf.xml.in | 8 ++-- interface-definitions/service_pppoe-server.xml.in | 8 ++-- interface-definitions/service_router-advert.xml.in | 10 ++--- interface-definitions/service_upnp.xml.in | 2 +- interface-definitions/service_webproxy.xml.in | 12 +++--- interface-definitions/snmp.xml.in | 46 +++++++++++----------- interface-definitions/system-conntrack.xml.in | 2 +- interface-definitions/system-console.xml.in | 4 +- interface-definitions/system-lcd.xml.in | 4 +- interface-definitions/system-login.xml.in | 8 ++-- interface-definitions/system-option.xml.in | 4 +- interface-definitions/system-proxy.xml.in | 4 +- interface-definitions/system-syslog.xml.in | 22 +++++------ interface-definitions/vpn_ipsec.xml.in | 36 ++++++++--------- interface-definitions/vpn_l2tp.xml.in | 4 +- interface-definitions/vpn_openconnect.xml.in | 2 +- interface-definitions/vpn_pptp.xml.in | 2 +- interface-definitions/zone-policy.xml.in | 6 +-- 105 files changed, 333 insertions(+), 333 deletions(-) diff --git a/interface-definitions/containers.xml.in b/interface-definitions/containers.xml.in index 9cd2b0902..13587711a 100644 --- a/interface-definitions/containers.xml.in +++ b/interface-definitions/containers.xml.in @@ -10,7 +10,7 @@ Container name - ^[-a-zA-Z0-9]+$ + [-a-zA-Z0-9]+ Container name must be alphanumeric and can contain hyphens @@ -52,7 +52,7 @@ Permission to set system clock - ^(net-admin|net-bind-service|net-raw|setpcap|sys-admin|sys-time)$ + (net-admin|net-bind-service|net-raw|setpcap|sys-admin|sys-time) @@ -88,7 +88,7 @@ Add custom environment variables - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Environment variable name must be alphanumeric and can contain hyphen and underscores @@ -194,7 +194,7 @@ tcp udp - ^(tcp|udp)$ + (tcp|udp) @@ -219,7 +219,7 @@ Restart containers when they exit, regardless of status, retrying indefinitely - ^(no|on-failure|always)$ + (no|on-failure|always) on-failure diff --git a/interface-definitions/dhcp-relay.xml.in b/interface-definitions/dhcp-relay.xml.in index 339941e65..27d0a3e6c 100644 --- a/interface-definitions/dhcp-relay.xml.in +++ b/interface-definitions/dhcp-relay.xml.in @@ -66,7 +66,7 @@ discard packet (default action if giaddr not set in packet) - ^(append|replace|forward|discard)$ + (append|replace|forward|discard) forward diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in index 2c4c1709d..60e738e01 100644 --- a/interface-definitions/dhcp-server.xml.in +++ b/interface-definitions/dhcp-server.xml.in @@ -58,7 +58,7 @@ Configure this server to be the secondary node - ^(primary|secondary)$ + (primary|secondary) Invalid DHCP failover peer status @@ -259,7 +259,7 @@ DHCP lease range - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Invalid range name, may only be alphanumeric, dot and hyphen @@ -294,7 +294,7 @@ Name of static mapping - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Invalid static mapping name, may only be alphanumeric, dot and hyphen diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index 7ae537d00..0d6418272 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -56,7 +56,7 @@ DNS domain completion order - [-a-zA-Z0-9.]+$ + [-a-zA-Z0-9.]+ Invalid domain name @@ -74,7 +74,7 @@ Host name for static address mapping - [A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$ + [A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9] invalid hostname @@ -83,7 +83,7 @@ Alias for this address - .{1,63}$ + .{1,63} invalid alias hostname, needs to be between 1 and 63 charactes diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in index 64826516e..6bc467b76 100644 --- a/interface-definitions/dns-dynamic.xml.in +++ b/interface-definitions/dns-dynamic.xml.in @@ -120,7 +120,7 @@ zoneedit.com Services - ^(custom|afraid|changeip|cloudflare|dnspark|dslreports|dyndns|easydns|namecheap|noip|sitelutions|zoneedit|\w+)$ + (custom|afraid|changeip|cloudflare|dnspark|dslreports|dyndns|easydns|namecheap|noip|sitelutions|zoneedit|\w+) You can use only predefined list of services or word characters (_, a-z, A-Z, 0-9) as service name @@ -232,7 +232,7 @@ Zoneedit protocol - ^(changeip|cloudflare|dnsmadeeasy|dnspark|dondominio|dslreports1|dtdns|duckdns|dyndns2|easydns|freedns|freemyip|googledomains|hammernode1|namecheap|nfsn|noip|sitelutions|woima|yandex|zoneedit1)$ + (changeip|cloudflare|dnsmadeeasy|dnspark|dondominio|dslreports1|dtdns|duckdns|dyndns2|easydns|freedns|freemyip|googledomains|hammernode1|namecheap|nfsn|noip|sitelutions|woima|yandex|zoneedit1) Please choose from the list of allowed protocols diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index 08501a4b5..6ead3e199 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -63,7 +63,7 @@ Full blown DNSSEC validation. Send SERVFAIL to clients on bogus responses. - ^(off|process-no-validate|process|log-fail|validate)$ + (off|process-no-validate|process|log-fail|validate) process-no-validate @@ -113,7 +113,7 @@ An absolute DNS name - ^[-_a-zA-Z0-9.]{1,63}$ + [-_a-zA-Z0-9.]{1,63} @@ -134,7 +134,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -167,7 +167,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -200,7 +200,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -212,7 +212,7 @@ An absolute DNS name - ^[-_a-zA-Z0-9.]{1,63}(?<!\.)$ + [-_a-zA-Z0-9.]{1,63}(?<!\.) @@ -232,7 +232,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -244,7 +244,7 @@ An absolute DNS name - ^[-_a-zA-Z0-9.]{1,63}(?<!\.)$ + [-_a-zA-Z0-9.]{1,63}(?<!\.) @@ -279,7 +279,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -291,7 +291,7 @@ An absolute DNS name - ^[-_a-zA-Z0-9.]{1,63}(?<!\.)$ + [-_a-zA-Z0-9.]{1,63}(?<!\.) @@ -311,7 +311,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -341,7 +341,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -370,7 +370,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -394,7 +394,7 @@ An absolute DNS name - ^[-_a-zA-Z0-9.]{1,63}(?<!\.)$ + [-_a-zA-Z0-9.]{1,63}(?<!\.) @@ -454,7 +454,7 @@ Root record - ^([-_a-zA-Z0-9.]{1,63}|@)(?<!\.)$ + ([-_a-zA-Z0-9.]{1,63}|@)(?<!\.) @@ -523,7 +523,7 @@ Service type - ^[a-zA-Z][a-zA-Z0-9]{0,31}(\+[a-zA-Z][a-zA-Z0-9]{0,31})?$ + [a-zA-Z][a-zA-Z0-9]{0,31}(\+[a-zA-Z][a-zA-Z0-9]{0,31})? @@ -540,7 +540,7 @@ An absolute DNS name - ^[-_a-zA-Z0-9.]{1,63}(?<!\.)$ + [-_a-zA-Z0-9.]{1,63}(?<!\.) diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in index f2aca4b3a..ff8d92a24 100644 --- a/interface-definitions/firewall.xml.in +++ b/interface-definitions/firewall.xml.in @@ -21,7 +21,7 @@ Disable processing of all IPv4 ICMP echo requests - ^(enable|disable)$ + (enable|disable) enable @@ -41,7 +41,7 @@ Disable processing of broadcast IPv4 ICMP echo/timestamp requests - ^(enable|disable)$ + (enable|disable) disable @@ -61,7 +61,7 @@ Disable sending SNMP trap on firewall configuration change - ^(enable|disable)$ + (enable|disable) disable @@ -75,7 +75,7 @@ Firewall address-group - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -104,7 +104,7 @@ Firewall ipv6-address-group - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -133,7 +133,7 @@ Firewall ipv6-network-group - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -157,7 +157,7 @@ Firewall mac-group - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -181,7 +181,7 @@ Firewall network-group - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -205,7 +205,7 @@ Firewall port-group - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -250,7 +250,7 @@ Disable processing of IPv4 packets with source route option - ^(enable|disable)$ + (enable|disable) disable @@ -259,7 +259,7 @@ IPv6 firewall rule-set name - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -396,7 +396,7 @@ Disable processing of received ICMPv6 redirect messages - ^(enable|disable)$ + (enable|disable) disable @@ -416,7 +416,7 @@ Disable processing of IPv6 packets with routing header - ^(enable|disable)$ + (enable|disable) disable @@ -436,7 +436,7 @@ Disable logging of Ipv4 packets with invalid addresses - ^(enable|disable)$ + (enable|disable) enable @@ -445,7 +445,7 @@ IPv4 firewall rule-set name - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -539,7 +539,7 @@ Disable processing of received IPv4 ICMP redirect messages - ^(enable|disable)$ + (enable|disable) disable @@ -559,7 +559,7 @@ Disable sending IPv4 ICMP redirect messages - ^(enable|disable)$ + (enable|disable) enable @@ -583,7 +583,7 @@ No source validation - ^(strict|loose|disable)$ + (strict|loose|disable) disable @@ -637,7 +637,7 @@ Disable use of TCP SYN cookies with IPv4 - ^(enable|disable)$ + (enable|disable) enable @@ -657,7 +657,7 @@ Disable RFC1337 TIME-WAIT hazards protection - ^(enable|disable)$ + (enable|disable) disable diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in index 133e45c72..fc59f8ab3 100644 --- a/interface-definitions/flow-accounting-conf.xml.in +++ b/interface-definitions/flow-accounting-conf.xml.in @@ -146,7 +146,7 @@ Authentication and authorization - ^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$ + (auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all) @@ -168,7 +168,7 @@ NetFlow engine-id for v9 / IPFIX - (\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])$ + (\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]) diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in index 662052e12..0631acdda 100644 --- a/interface-definitions/high-availability.xml.in +++ b/interface-definitions/high-availability.xml.in @@ -63,7 +63,7 @@ AH - IPSEC (not recommended) - ^(plaintext-password|ah)$ + (plaintext-password|ah) Authentication type must be plaintext-password or ah @@ -323,7 +323,7 @@ Locality-Based least connection - ^(round-robin|weighted-round-robin|least-connection|weighted-least-connection|source-hashing|destination-hashing|locality-based-least-connection)$ + (round-robin|weighted-round-robin|least-connection|weighted-least-connection|source-hashing|destination-hashing|locality-based-least-connection) least-connection @@ -360,7 +360,7 @@ Tunneling - ^(direct|nat|tunnel)$ + (direct|nat|tunnel) nat @@ -394,7 +394,7 @@ UDP - ^(tcp|udp)$ + (tcp|udp) tcp diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in index 6fea2f1f6..d2c393036 100644 --- a/interface-definitions/https.xml.in +++ b/interface-definitions/https.xml.in @@ -38,7 +38,7 @@ - \*$ + \* diff --git a/interface-definitions/igmp-proxy.xml.in b/interface-definitions/igmp-proxy.xml.in index c7ab60929..8e738fa7f 100644 --- a/interface-definitions/igmp-proxy.xml.in +++ b/interface-definitions/igmp-proxy.xml.in @@ -56,7 +56,7 @@ Disabled interface - ^(upstream|downstream|disabled)$ + (upstream|downstream|disabled) downstream diff --git a/interface-definitions/include/accel-ppp/auth-mode.xml.i b/interface-definitions/include/accel-ppp/auth-mode.xml.i index a7711b675..c1a87cfe3 100644 --- a/interface-definitions/include/accel-ppp/auth-mode.xml.i +++ b/interface-definitions/include/accel-ppp/auth-mode.xml.i @@ -11,7 +11,7 @@ Use RADIUS server for user autentication - ^(local|radius)$ + (local|radius) local radius diff --git a/interface-definitions/include/accel-ppp/auth-protocols.xml.i b/interface-definitions/include/accel-ppp/auth-protocols.xml.i index 480747f53..d43266152 100644 --- a/interface-definitions/include/accel-ppp/auth-protocols.xml.i +++ b/interface-definitions/include/accel-ppp/auth-protocols.xml.i @@ -22,7 +22,7 @@ Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2) - ^(pap|chap|mschap|mschap-v2)$ + (pap|chap|mschap|mschap-v2) diff --git a/interface-definitions/include/accel-ppp/ppp-mppe.xml.i b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i index e8370180b..4c2e84c25 100644 --- a/interface-definitions/include/accel-ppp/ppp-mppe.xml.i +++ b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i @@ -18,7 +18,7 @@ drop all mppe - ^(require|prefer|deny)$ + (require|prefer|deny) prefer diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i index 3e065329d..a45390f43 100644 --- a/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i +++ b/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i @@ -3,7 +3,7 @@ IPv4 negotiation algorithm - ^(deny|allow)$ + (deny|allow) invalid value diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i index b9fbac5c6..98abc1111 100644 --- a/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i +++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i @@ -3,7 +3,7 @@ IPv6 (IPCP6) negotiation algorithm - ^(deny|allow|prefer|require)$ + (deny|allow|prefer|require) invalid value diff --git a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i index de42eeac9..34b5ec7d7 100644 --- a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i +++ b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i @@ -15,7 +15,7 @@ Name of IPv4 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores @@ -31,7 +31,7 @@ Name of IPv4 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores diff --git a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i index 2bf4753be..06c661a90 100644 --- a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i +++ b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i @@ -15,7 +15,7 @@ Name of IPv6 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores @@ -31,7 +31,7 @@ Name of IPv6 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores diff --git a/interface-definitions/include/bgp/afi-label.xml.i b/interface-definitions/include/bgp/afi-label.xml.i index f7a1f609f..9535d19e8 100644 --- a/interface-definitions/include/bgp/afi-label.xml.i +++ b/interface-definitions/include/bgp/afi-label.xml.i @@ -25,7 +25,7 @@ - ^(auto)$ + (auto) diff --git a/interface-definitions/include/bgp/afi-rd.xml.i b/interface-definitions/include/bgp/afi-rd.xml.i index c4d29268c..767502094 100644 --- a/interface-definitions/include/bgp/afi-rd.xml.i +++ b/interface-definitions/include/bgp/afi-rd.xml.i @@ -17,7 +17,7 @@ Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy) - ^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$ + ((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5} diff --git a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i index eae10d312..c218937c8 100644 --- a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i +++ b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i @@ -10,7 +10,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -26,7 +26,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i index a56745380..75221a348 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i @@ -27,7 +27,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -43,7 +43,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -59,7 +59,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -177,7 +177,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores diff --git a/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i b/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i index 25558cd5c..4399d7988 100644 --- a/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i +++ b/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i @@ -18,7 +18,7 @@ Enable BGP graceful restart helper only functionality - ^(enable|disable|restart-helper)$ + (enable|disable|restart-helper) diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index b59ff0287..abaff5232 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -1106,7 +1106,7 @@ Ignore paths without link bandwidth for ECMP (if other paths have it) - ^(default-weight-for-missing|ignore|skip-missing)$ + (default-weight-for-missing|ignore|skip-missing) @@ -1461,7 +1461,7 @@ Name of peer-group - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ diff --git a/interface-definitions/include/bgp/remote-as.xml.i b/interface-definitions/include/bgp/remote-as.xml.i index 11eb7c256..58595b3b9 100644 --- a/interface-definitions/include/bgp/remote-as.xml.i +++ b/interface-definitions/include/bgp/remote-as.xml.i @@ -19,7 +19,7 @@ - ^(external|internal)$ + (external|internal) Invalid AS number diff --git a/interface-definitions/include/firewall/action-accept-drop-reject.xml.i b/interface-definitions/include/firewall/action-accept-drop-reject.xml.i index 9f8baa884..7fd52319a 100644 --- a/interface-definitions/include/firewall/action-accept-drop-reject.xml.i +++ b/interface-definitions/include/firewall/action-accept-drop-reject.xml.i @@ -18,7 +18,7 @@ Action to reject - ^(accept|drop|reject)$ + (accept|drop|reject) diff --git a/interface-definitions/include/firewall/action.xml.i b/interface-definitions/include/firewall/action.xml.i index 4ba93e3aa..0f60e3c38 100644 --- a/interface-definitions/include/firewall/action.xml.i +++ b/interface-definitions/include/firewall/action.xml.i @@ -18,7 +18,7 @@ Drop matching entries - ^(accept|reject|drop)$ + (accept|reject|drop) diff --git a/interface-definitions/include/firewall/common-rule.xml.i b/interface-definitions/include/firewall/common-rule.xml.i index cd80b7e28..cbdfa9dc2 100644 --- a/interface-definitions/include/firewall/common-rule.xml.i +++ b/interface-definitions/include/firewall/common-rule.xml.i @@ -70,7 +70,7 @@ integer/unit (Example: 5/minute) - ^\d+/(second|minute|hour|day)$ + \d+/(second|minute|hour|day) @@ -91,7 +91,7 @@ Disable log - ^(enable|disable)$ + (enable|disable) @@ -163,7 +163,7 @@ Source addresses seen COUNT times in the last hour - ^(second|minute|hour)$ + (second|minute|hour) @@ -215,7 +215,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -234,7 +234,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -253,7 +253,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -272,7 +272,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -292,7 +292,7 @@ Enter date using following notation - YYYY-MM-DD - ^(\d{4}\-\d{2}\-\d{2})$ + (\d{4}\-\d{2}\-\d{2}) @@ -304,7 +304,7 @@ Enter time using using 24 hour notation - hh:mm:ss - ^([0-2][0-9](\:[0-5][0-9]){1,2})$ + ([0-2][0-9](\:[0-5][0-9]){1,2}) @@ -316,7 +316,7 @@ Enter date using following notation - YYYY-MM-DD - ^(\d{4}\-\d{2}\-\d{2})$ + (\d{4}\-\d{2}\-\d{2}) @@ -328,7 +328,7 @@ Enter time using using 24 hour notation - hh:mm:ss - ^([0-2][0-9](\:[0-5][0-9]){1,2})$ + ([0-2][0-9](\:[0-5][0-9]){1,2}) diff --git a/interface-definitions/include/firewall/icmp-type-name.xml.i b/interface-definitions/include/firewall/icmp-type-name.xml.i index f57def3e1..d4197cf82 100644 --- a/interface-definitions/include/firewall/icmp-type-name.xml.i +++ b/interface-definitions/include/firewall/icmp-type-name.xml.i @@ -66,7 +66,7 @@ ICMP type 18: address-mask-reply - ^(echo-reply|destination-unreachable|source-quench|redirect|echo-request|router-advertisement|router-solicitation|time-exceeded|parameter-problem|timestamp-request|timestamp-reply|info-request|info-reply|address-mask-request|address-mask-reply)$ + (echo-reply|destination-unreachable|source-quench|redirect|echo-request|router-advertisement|router-solicitation|time-exceeded|parameter-problem|timestamp-request|timestamp-reply|info-request|info-reply|address-mask-request|address-mask-reply) diff --git a/interface-definitions/include/firewall/icmpv6-type-name.xml.i b/interface-definitions/include/firewall/icmpv6-type-name.xml.i index b13cf02c4..a2e68abfb 100644 --- a/interface-definitions/include/firewall/icmpv6-type-name.xml.i +++ b/interface-definitions/include/firewall/icmpv6-type-name.xml.i @@ -66,7 +66,7 @@ ICMPv6 type 138: router-renumbering - ^(destination-unreachable|packet-too-big|time-exceeded|echo-request|echo-reply|mld-listener-query|mld-listener-report|mld-listener-reduction|nd-router-solicit|nd-router-advert|nd-neighbor-solicit|nd-neighbor-advert|nd-redirect|parameter-problem|router-renumbering)$ + (destination-unreachable|packet-too-big|time-exceeded|echo-request|echo-reply|mld-listener-query|mld-listener-report|mld-listener-reduction|nd-router-solicit|nd-router-advert|nd-neighbor-solicit|nd-neighbor-advert|nd-redirect|parameter-problem|router-renumbering) diff --git a/interface-definitions/include/firewall/name-default-action.xml.i b/interface-definitions/include/firewall/name-default-action.xml.i index 8470a29a9..512b0296f 100644 --- a/interface-definitions/include/firewall/name-default-action.xml.i +++ b/interface-definitions/include/firewall/name-default-action.xml.i @@ -18,7 +18,7 @@ Accept if no prior rules are hit - ^(drop|reject|accept)$ + (drop|reject|accept) diff --git a/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i index 123590c08..b9dd59bea 100644 --- a/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i +++ b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i @@ -23,7 +23,7 @@ - ^(dhcp|dhcpv6)$ + (dhcp|dhcpv6) diff --git a/interface-definitions/include/interface/adjust-mss.xml.i b/interface-definitions/include/interface/adjust-mss.xml.i index 57019f02c..41140ffe1 100644 --- a/interface-definitions/include/interface/adjust-mss.xml.i +++ b/interface-definitions/include/interface/adjust-mss.xml.i @@ -16,7 +16,7 @@ - ^(clamp-mss-to-pmtu)$ + (clamp-mss-to-pmtu) diff --git a/interface-definitions/include/interface/description.xml.i b/interface-definitions/include/interface/description.xml.i index 8579cf7d1..de01d22ca 100644 --- a/interface-definitions/include/interface/description.xml.i +++ b/interface-definitions/include/interface/description.xml.i @@ -3,7 +3,7 @@ Interface specific description - .{1,256}$ + .{1,256} Description too long (limit 256 characters) diff --git a/interface-definitions/include/interface/parameters-flowlabel.xml.i b/interface-definitions/include/interface/parameters-flowlabel.xml.i index bd0d1e070..b2e88215b 100644 --- a/interface-definitions/include/interface/parameters-flowlabel.xml.i +++ b/interface-definitions/include/interface/parameters-flowlabel.xml.i @@ -14,7 +14,7 @@ Tunnel key, or hex value - ^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$ + ((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit) Must be 'inherit' or a number diff --git a/interface-definitions/include/interface/source-validation.xml.i b/interface-definitions/include/interface/source-validation.xml.i index f38065f4d..fc9a7d376 100644 --- a/interface-definitions/include/interface/source-validation.xml.i +++ b/interface-definitions/include/interface/source-validation.xml.i @@ -18,7 +18,7 @@ No source validation - ^(strict|loose|disable)$ + (strict|loose|disable) diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i index 3b305618e..c1af9f9e3 100644 --- a/interface-definitions/include/interface/vif-s.xml.i +++ b/interface-definitions/include/interface/vif-s.xml.i @@ -35,7 +35,7 @@ VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100 - ^(802.1q|802.1ad)$ + (802.1q|802.1ad) Ethertype must be 802.1ad or 802.1q diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i index 4e7f9b3c2..57ef8d64c 100644 --- a/interface-definitions/include/interface/vif.xml.i +++ b/interface-definitions/include/interface/vif.xml.i @@ -28,7 +28,7 @@ Format for qos mapping, e.g.: '0:1 1:6 7:6' - [:0-7 ]+$ + [:0-7 ]+ QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 @@ -41,7 +41,7 @@ Format for qos mapping, e.g.: '0:1 1:6 7:6' - [:0-7 ]+$ + [:0-7 ]+ QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 diff --git a/interface-definitions/include/ipsec/local-address.xml.i b/interface-definitions/include/ipsec/local-address.xml.i index 2de6ecb1f..dc5653ce7 100644 --- a/interface-definitions/include/ipsec/local-address.xml.i +++ b/interface-definitions/include/ipsec/local-address.xml.i @@ -20,7 +20,7 @@ - ^(any)$ + (any) diff --git a/interface-definitions/include/nat-translation-options.xml.i b/interface-definitions/include/nat-translation-options.xml.i index 925f90106..6b95de045 100644 --- a/interface-definitions/include/nat-translation-options.xml.i +++ b/interface-definitions/include/nat-translation-options.xml.i @@ -19,7 +19,7 @@ Random source or destination address allocation for each connection - ^(persistent|random)$ + (persistent|random) random @@ -43,7 +43,7 @@ Do not apply port randomization - ^(random|fully-random|none)$ + (random|fully-random|none) none diff --git a/interface-definitions/include/ospf/authentication.xml.i b/interface-definitions/include/ospf/authentication.xml.i index 1e6050b97..8e8cad067 100644 --- a/interface-definitions/include/ospf/authentication.xml.i +++ b/interface-definitions/include/ospf/authentication.xml.i @@ -29,7 +29,7 @@ MD5 Key (16 characters or less) - ^[^[:space:]]{1,16}$ + [^[:space:]]{1,16} Password must be 16 characters or less @@ -46,7 +46,7 @@ Plain text password (8 characters or less) - ^[^[:space:]]{1,8}$ + [^[:space:]]{1,8} Password must be 8 characters or less diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i index 3a3372e47..c156d5b1c 100644 --- a/interface-definitions/include/ospf/protocol-common-config.xml.i +++ b/interface-definitions/include/ospf/protocol-common-config.xml.i @@ -45,7 +45,7 @@ Filter static routes - ^(bgp|connected|isis|kernel|rip|static)$ + (bgp|connected|isis|kernel|rip|static) Must be bgp, connected, kernel, rip, or static @@ -123,7 +123,7 @@ Never translate LSA types - ^(always|candidate|never)$ + (always|candidate|never) candidate @@ -172,7 +172,7 @@ Use MD5 authentication - ^(plaintext-password|md5)$ + (plaintext-password|md5) @@ -252,7 +252,7 @@ Enable shortcutting mode - ^(default|disable|enable)$ + (default|disable|enable) @@ -432,7 +432,7 @@ Point-to-point network type - ^(broadcast|non-broadcast|point-to-multipoint|point-to-point)$ + (broadcast|non-broadcast|point-to-multipoint|point-to-point) Must be broadcast, non-broadcast, point-to-multipoint or point-to-point @@ -586,7 +586,7 @@ Standard ABR type - ^(cisco|ibm|shortcut|standard)$ + (cisco|ibm|shortcut|standard) cisco @@ -617,7 +617,7 @@ Default to suppress routing updates on all interfaces - ^(default)$ + (default) diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i index 792c873c8..630534eea 100644 --- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i +++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i @@ -184,7 +184,7 @@ Point-to-point network type - ^(broadcast|point-to-point)$ + (broadcast|point-to-point) Must be broadcast or point-to-point diff --git a/interface-definitions/include/policy/action.xml.i b/interface-definitions/include/policy/action.xml.i index 3b9b458d4..0a3dc158a 100644 --- a/interface-definitions/include/policy/action.xml.i +++ b/interface-definitions/include/policy/action.xml.i @@ -14,7 +14,7 @@ Deny matching entries - ^(permit|deny)$ + (permit|deny) diff --git a/interface-definitions/include/policy/route-common-rule-ipv6.xml.i b/interface-definitions/include/policy/route-common-rule-ipv6.xml.i index 406125e55..cfeba1a6c 100644 --- a/interface-definitions/include/policy/route-common-rule-ipv6.xml.i +++ b/interface-definitions/include/policy/route-common-rule-ipv6.xml.i @@ -91,7 +91,7 @@ Disable log - ^(enable|disable)$ + (enable|disable) @@ -196,7 +196,7 @@ - ^(main)$ + (main) @@ -260,7 +260,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -279,7 +279,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -298,7 +298,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -317,7 +317,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -543,7 +543,7 @@ ICMP type/code name - ^(any|echo-reply|pong|destination-unreachable|network-unreachable|host-unreachable|protocol-unreachable|port-unreachable|fragmentation-needed|source-route-failed|network-unknown|host-unknown|network-prohibited|host-prohibited|TOS-network-unreachable|TOS-host-unreachable|communication-prohibited|host-precedence-violation|precedence-cutoff|source-quench|redirect|network-redirect|host-redirect|TOS-network-redirect|TOS host-redirect|echo-request|ping|router-advertisement|router-solicitation|time-exceeded|ttl-exceeded|ttl-zero-during-transit|ttl-zero-during-reassembly|parameter-problem|ip-header-bad|required-option-missing|timestamp-request|timestamp-reply|address-mask-request|address-mask-reply|packet-too-big)$ + (any|echo-reply|pong|destination-unreachable|network-unreachable|host-unreachable|protocol-unreachable|port-unreachable|fragmentation-needed|source-route-failed|network-unknown|host-unknown|network-prohibited|host-prohibited|TOS-network-unreachable|TOS-host-unreachable|communication-prohibited|host-precedence-violation|precedence-cutoff|source-quench|redirect|network-redirect|host-redirect|TOS-network-redirect|TOS host-redirect|echo-request|ping|router-advertisement|router-solicitation|time-exceeded|ttl-exceeded|ttl-zero-during-transit|ttl-zero-during-reassembly|parameter-problem|ip-header-bad|required-option-missing|timestamp-request|timestamp-reply|address-mask-request|address-mask-reply|packet-too-big) diff --git a/interface-definitions/include/policy/route-common-rule.xml.i b/interface-definitions/include/policy/route-common-rule.xml.i index 33c4ba77c..5a17dbc95 100644 --- a/interface-definitions/include/policy/route-common-rule.xml.i +++ b/interface-definitions/include/policy/route-common-rule.xml.i @@ -91,7 +91,7 @@ Disable log - ^(enable|disable)$ + (enable|disable) @@ -196,7 +196,7 @@ - ^(main)$ + (main) @@ -260,7 +260,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -279,7 +279,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -298,7 +298,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -317,7 +317,7 @@ Disable - ^(enable|disable)$ + (enable|disable) diff --git a/interface-definitions/include/policy/route-rule-action.xml.i b/interface-definitions/include/policy/route-rule-action.xml.i index 9c880579d..1217055f2 100644 --- a/interface-definitions/include/policy/route-rule-action.xml.i +++ b/interface-definitions/include/policy/route-rule-action.xml.i @@ -10,7 +10,7 @@ Drop matching entries - ^(drop)$ + (drop) diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i index 88092b7d4..019868373 100644 --- a/interface-definitions/include/route-map.xml.i +++ b/interface-definitions/include/route-map.xml.i @@ -10,7 +10,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores diff --git a/interface-definitions/include/routing-passive-interface.xml.i b/interface-definitions/include/routing-passive-interface.xml.i index 43dfb5e44..095b683de 100644 --- a/interface-definitions/include/routing-passive-interface.xml.i +++ b/interface-definitions/include/routing-passive-interface.xml.i @@ -15,7 +15,7 @@ Default to suppress routing updates on all interfaces - ^(default)$ + (default) diff --git a/interface-definitions/include/snmp/access-mode.xml.i b/interface-definitions/include/snmp/access-mode.xml.i index 71c766774..7469805ac 100644 --- a/interface-definitions/include/snmp/access-mode.xml.i +++ b/interface-definitions/include/snmp/access-mode.xml.i @@ -14,7 +14,7 @@ read write - ^(ro|rw)$ + (ro|rw) Authorization type must be either 'rw' or 'ro' diff --git a/interface-definitions/include/snmp/authentication-type.xml.i b/interface-definitions/include/snmp/authentication-type.xml.i index ca0bb10a6..047d8cff4 100644 --- a/interface-definitions/include/snmp/authentication-type.xml.i +++ b/interface-definitions/include/snmp/authentication-type.xml.i @@ -14,7 +14,7 @@ Secure Hash Algorithm - ^(md5|sha)$ + (md5|sha) md5 diff --git a/interface-definitions/include/snmp/privacy-type.xml.i b/interface-definitions/include/snmp/privacy-type.xml.i index 94029a6c6..d5fd1e811 100644 --- a/interface-definitions/include/snmp/privacy-type.xml.i +++ b/interface-definitions/include/snmp/privacy-type.xml.i @@ -14,7 +14,7 @@ Advanced Encryption Standard - ^(des|aes)$ + (des|aes) des diff --git a/interface-definitions/include/snmp/protocol.xml.i b/interface-definitions/include/snmp/protocol.xml.i index ebdeef87e..d7e6752ad 100644 --- a/interface-definitions/include/snmp/protocol.xml.i +++ b/interface-definitions/include/snmp/protocol.xml.i @@ -14,7 +14,7 @@ Listen protocol TCP - ^(udp|tcp)$ + (udp|tcp) udp diff --git a/interface-definitions/include/ssh-user.xml.i b/interface-definitions/include/ssh-user.xml.i index 17ba05a90..6ac1f35bc 100644 --- a/interface-definitions/include/ssh-user.xml.i +++ b/interface-definitions/include/ssh-user.xml.i @@ -3,7 +3,7 @@ Allow specific users to login - ^[-_a-zA-Z0-9.]{1,100} + [-_a-zA-Z0-9.]{1,100} Illegal characters or more than 100 characters diff --git a/interface-definitions/include/static/static-route-vrf.xml.i b/interface-definitions/include/static/static-route-vrf.xml.i index 69aba253c..e1968f04a 100644 --- a/interface-definitions/include/static/static-route-vrf.xml.i +++ b/interface-definitions/include/static/static-route-vrf.xml.i @@ -11,7 +11,7 @@ Name of VRF to leak to - ^(default)$ + (default) diff --git a/interface-definitions/include/vpn-ipsec-encryption.xml.i b/interface-definitions/include/vpn-ipsec-encryption.xml.i index eb0678aa9..629e6a0b9 100644 --- a/interface-definitions/include/vpn-ipsec-encryption.xml.i +++ b/interface-definitions/include/vpn-ipsec-encryption.xml.i @@ -226,7 +226,7 @@ 256 bit ChaCha20/Poly1305 with 128 bit ICV - ^(null|aes128|aes192|aes256|aes128ctr|aes192ctr|aes256ctr|aes128ccm64|aes192ccm64|aes256ccm64|aes128ccm96|aes192ccm96|aes256ccm96|aes128ccm128|aes192ccm128|aes256ccm128|aes128gcm64|aes192gcm64|aes256gcm64|aes128gcm96|aes192gcm96|aes256gcm96|aes128gcm128|aes192gcm128|aes256gcm128|aes128gmac|aes192gmac|aes256gmac|3des|blowfish128|blowfish192|blowfish256|camellia128|camellia192|camellia256|camellia128ctr|camellia192ctr|camellia256ctr|camellia128ccm64|camellia192ccm64|camellia256ccm64|camellia128ccm96|camellia192ccm96|camellia256ccm96|camellia128ccm128|camellia192ccm128|camellia256ccm128|serpent128|serpent192|serpent256|twofish128|twofish192|twofish256|cast128|chacha20poly1305)$ + (null|aes128|aes192|aes256|aes128ctr|aes192ctr|aes256ctr|aes128ccm64|aes192ccm64|aes256ccm64|aes128ccm96|aes192ccm96|aes256ccm96|aes128ccm128|aes192ccm128|aes256ccm128|aes128gcm64|aes192gcm64|aes256gcm64|aes128gcm96|aes192gcm96|aes256gcm96|aes128gcm128|aes192gcm128|aes256gcm128|aes128gmac|aes192gmac|aes256gmac|3des|blowfish128|blowfish192|blowfish256|camellia128|camellia192|camellia256|camellia128ctr|camellia192ctr|camellia256ctr|camellia128ccm64|camellia192ccm64|camellia256ccm64|camellia128ccm96|camellia192ccm96|camellia256ccm96|camellia128ccm128|camellia192ccm128|camellia256ccm128|serpent128|serpent192|serpent256|twofish128|twofish192|twofish256|cast128|chacha20poly1305) aes128 diff --git a/interface-definitions/include/vpn-ipsec-hash.xml.i b/interface-definitions/include/vpn-ipsec-hash.xml.i index d6259574a..73d19c24b 100644 --- a/interface-definitions/include/vpn-ipsec-hash.xml.i +++ b/interface-definitions/include/vpn-ipsec-hash.xml.i @@ -58,7 +58,7 @@ 256-bit AES-GMAC - ^(md5|md5_128|sha1|sha1_160|sha256|sha256_96|sha384|sha512|aesxcbc|aescmac|aes128gmac|aes192gmac|aes256gmac)$ + (md5|md5_128|sha1|sha1_160|sha256|sha256_96|sha384|sha512|aesxcbc|aescmac|aes128gmac|aes192gmac|aes256gmac) sha1 diff --git a/interface-definitions/include/webproxy-url-filtering.xml.i b/interface-definitions/include/webproxy-url-filtering.xml.i index 265bbff94..7763cb393 100644 --- a/interface-definitions/include/webproxy-url-filtering.xml.i +++ b/interface-definitions/include/webproxy-url-filtering.xml.i @@ -38,7 +38,7 @@ Default filter action is block - ^(allow|block)$ + (allow|block) diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 5ae67a672..96dede723 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -7,7 +7,7 @@ Bonding Interface/Link Aggregation 320 - ^bond[0-9]+$ + bond[0-9]+ Bonding interface must be named bondN @@ -85,7 +85,7 @@ combine encapsulated IP address and port to make hash - ^(layer2\+3|layer3\+4|layer2|encap2\+3|encap3\+4)$ + (layer2\+3|layer3\+4|layer2|encap2\+3|encap3\+4) hash-policy must be layer2 layer2+3 layer3+4 encap2+3 or encap3+4 @@ -122,7 +122,7 @@ Request partner to transmit LACPDUs every 1 second - ^(slow|fast)$ + (slow|fast) slow @@ -162,7 +162,7 @@ Distribute based on MAC address - ^(802.3ad|active-backup|broadcast|round-robin|transmit-load-balance|adaptive-load-balance|xor-hash)$ + (802.3ad|active-backup|broadcast|round-robin|transmit-load-balance|adaptive-load-balance|xor-hash) mode must be 802.3ad, active-backup, broadcast, round-robin, transmit-load-balance, adaptive-load-balance, or xor diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index be4c92583..60edf3ce2 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -7,7 +7,7 @@ Bridge Interface 310 - ^br[0-9]+$ + br[0-9]+ Bridge interface must be named brN diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in index 7f9ae90e5..01438de31 100644 --- a/interface-definitions/interfaces-dummy.xml.in +++ b/interface-definitions/interfaces-dummy.xml.in @@ -7,7 +7,7 @@ Dummy Interface 300 - ^dum[0-9]+$ + dum[0-9]+ Dummy interface must be named dumN diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index 7fa07e9ec..c821f04b2 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -14,7 +14,7 @@ Ethernet interface name - ^((eth|lan)[0-9]+|(eno|ens|enp|enx).+)$ + ((eth|lan)[0-9]+|(eno|ens|enp|enx).+) Invalid Ethernet interface name @@ -52,7 +52,7 @@ Full duplex - ^(auto|half|full)$ + (auto|half|full) duplex must be auto, half or full @@ -159,7 +159,7 @@ 100 Gbit/sec - ^(auto|10|100|1000|2500|5000|10000|25000|40000|50000|100000)$ + (auto|10|100|1000|2500|5000|10000|25000|40000|50000|100000) Speed must be auto, 10, 100, 1000, 2500, 5000, 10000, 25000, 40000, 50000 or 100000 diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 9143ba6be..6e8a8fee2 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -7,7 +7,7 @@ Generic Network Virtualization Encapsulation (GENEVE) Interface 460 - ^gnv[0-9]+$ + gnv[0-9]+ GENEVE interface must be named gnvN diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in index 1f23a89a5..6a85064cd 100644 --- a/interface-definitions/interfaces-l2tpv3.xml.in +++ b/interface-definitions/interfaces-l2tpv3.xml.in @@ -7,7 +7,7 @@ Layer 2 Tunnel Protocol Version 3 (L2TPv3) Interface 485 - ^l2tpeth[0-9]+$ + l2tpeth[0-9]+ L2TPv3 interface must be named l2tpethN @@ -49,7 +49,7 @@ IP encapsulation - ^(udp|ip)$ + (udp|ip) Encapsulation must be UDP or IP diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in index 7ac0545c6..7f59db543 100644 --- a/interface-definitions/interfaces-loopback.xml.in +++ b/interface-definitions/interfaces-loopback.xml.in @@ -7,7 +7,7 @@ Loopback Interface 300 - ^lo$ + lo Loopback interface must be named lo diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in index cb3c489aa..dbb989588 100644 --- a/interface-definitions/interfaces-macsec.xml.in +++ b/interface-definitions/interfaces-macsec.xml.in @@ -7,7 +7,7 @@ MACsec Interface (802.1ae) 461 - ^macsec[0-9]+$ + macsec[0-9]+ MACsec interface must be named macsecN @@ -44,7 +44,7 @@ Galois/Counter Mode of AES cipher with 256-bit key - ^(gcm-aes-128|gcm-aes-256)$ + (gcm-aes-128|gcm-aes-256) @@ -67,7 +67,7 @@ 16-byte (128-bit) hex-string (32 hex-digits) - ^[A-Fa-f0-9]{32}$ + [A-Fa-f0-9]{32} @@ -79,7 +79,7 @@ 32-byte (256-bit) hex-string (64 hex-digits) - ^[A-Fa-f0-9]{64}$ + [A-Fa-f0-9]{64} diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in index c917b9312..edcf7b37f 100644 --- a/interface-definitions/interfaces-openvpn.xml.in +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -7,7 +7,7 @@ OpenVPN Tunnel Interface 460 - ^vtun[0-9]+$ + vtun[0-9]+ OpenVPN tunnel interface must be named vtunN @@ -51,7 +51,7 @@ TAP device, required for OSI layer 2 - ^(tun|tap)$ + (tun|tap) tun @@ -113,7 +113,7 @@ AES algorithm with 256-bit key GCM - ^(none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)$ + (none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm) @@ -160,7 +160,7 @@ AES algorithm with 256-bit key GCM - ^(none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)$ + (none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm) @@ -196,7 +196,7 @@ SHA-512 algorithm - ^(md5|sha1|sha256|sha384|sha512)$ + (md5|sha1|sha256|sha384|sha512) @@ -298,7 +298,7 @@ Server in client-server mode - ^(site-to-site|client|server)$ + (site-to-site|client|server) @@ -336,7 +336,7 @@ TCP and initiates connections actively - ^(udp|tcp-passive|tcp-active)$ + (udp|tcp-passive|tcp-active) udp @@ -631,7 +631,7 @@ Subnet topology - ^(subnet|point-to-point|net30)$ + (subnet|point-to-point|net30) net30 @@ -713,7 +713,7 @@ Enable chalenge-response - ^(disable|enable)$ + (disable|enable) enable @@ -786,7 +786,7 @@ TLS v1.3 - ^(1.0|1.1|1.2|1.3)$ + (1.0|1.1|1.2|1.3) @@ -805,7 +805,7 @@ Wait for incoming TLS connection - ^(active|passive)$ + (active|passive) diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in index 8cd8f8c86..664914baa 100644 --- a/interface-definitions/interfaces-pppoe.xml.in +++ b/interface-definitions/interfaces-pppoe.xml.in @@ -7,7 +7,7 @@ Point-to-Point Protocol over Ethernet (PPPoE) 322 - ^pppoe[0-9]+$ + pppoe[0-9]+ PPPoE interface must be named pppoeN @@ -106,7 +106,7 @@ Service name, only connect to access concentrators advertising this - [a-zA-Z0-9]+$ + [a-zA-Z0-9]+ Service name must be alphanumeric only diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in index 5f5e9fdef..6b62f4c61 100644 --- a/interface-definitions/interfaces-pseudo-ethernet.xml.in +++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in @@ -7,7 +7,7 @@ Pseudo Ethernet 321 - ^peth[0-9]+$ + peth[0-9]+ Pseudo Ethernet interface must be named pethN @@ -53,7 +53,7 @@ Promicious mode passthrough of underlying device - ^(private|vepa|bridge|passthru)$ + (private|vepa|bridge|passthru) mode must be private, vepa, bridge or passthru diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in index 42ec62775..98ff878ba 100644 --- a/interface-definitions/interfaces-tunnel.xml.in +++ b/interface-definitions/interfaces-tunnel.xml.in @@ -7,7 +7,7 @@ Tunnel interface 380 - ^tun[0-9]+$ + tun[0-9]+ tunnel interface must be named tunN @@ -102,7 +102,7 @@ Simple Internet Transition (IPv6 in IPv4) - ^(erspan|gre|gretap|ip6erspan|ip6gre|ip6gretap|ip6ip6|ipip|ipip6|sit)$ + (erspan|gre|gretap|ip6erspan|ip6gre|ip6gretap|ip6ip6|ipip|ipip6|sit) Invalid encapsulation, must be one of: erspan, gre, gretap, ip6erspan, ip6gre, ip6gretap, ipip, sit, ipip6 or ip6ip6 @@ -123,7 +123,7 @@ Disable multicast (default) - ^(enable|disable)$ + (enable|disable) Must be 'disable' or 'enable' @@ -153,7 +153,7 @@ Mirror egress traffic - ^(ingress|egress)$ + (ingress|egress) @@ -248,7 +248,7 @@ Disable encapsulation limit - ^(none)$ + (none) Tunnel encaplimit must be 0-255 or none diff --git a/interface-definitions/interfaces-vti.xml.in b/interface-definitions/interfaces-vti.xml.in index 5893e4c4c..b471c3b92 100644 --- a/interface-definitions/interfaces-vti.xml.in +++ b/interface-definitions/interfaces-vti.xml.in @@ -7,7 +7,7 @@ Virtual Tunnel interface 381 - ^vti[0-9]+$ + vti[0-9]+ VTI interface must be named vtiN diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 8b50fe1b7..faa3dd5e0 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -7,7 +7,7 @@ Virtual Extensible LAN (VXLAN) Interface 460 - ^vxlan[0-9]+$ + vxlan[0-9]+ VXLAN interface must be named vxlanN diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index eb0892f07..4a1b4ac68 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -7,7 +7,7 @@ WireGuard Interface 459 - ^wg[0-9]+$ + wg[0-9]+ WireGuard interface must be named wgN @@ -46,7 +46,7 @@ Base64 encoded private key - [0-9a-zA-Z\+/]{43}=$ + [0-9a-zA-Z\+/]{43}= Key is not valid 44-character (32-bytes) base64 @@ -55,7 +55,7 @@ peer alias - [^ ]{1,100}$ + [^ ]{1,100} peer alias too long (limit 100 characters) @@ -65,7 +65,7 @@ base64 encoded public key - [0-9a-zA-Z\+/]{43}=$ + [0-9a-zA-Z\+/]{43}= Key is not valid 44-character (32-bytes) base64 @@ -74,7 +74,7 @@ base64 encoded preshared key - [0-9a-zA-Z\+/]{43}=$ + [0-9a-zA-Z\+/]{43}= Key is not valid 44-character (32-bytes) base64 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 @@ - ^wlan[0-9]+$ + wlan[0-9]+ Wireless interface must be named wlanN @@ -63,7 +63,7 @@ Supported channel set width both 20 MHz and 40 MHz with secondary channel below primary channel - ^(ht20|ht40\+|ht40-)$ + (ht20|ht40\+|ht40-) @@ -113,7 +113,7 @@ Set maximum A-MSDU length to 7935 octets - ^(3839|7935)$ + (3839|7935) @@ -132,7 +132,7 @@ Short GI for 40 MHz - ^(20|40)$ + (20|40) @@ -152,7 +152,7 @@ DYNAMIC Spatial Multiplexing (SM) Power Save - ^(static|dynamic)$ + (static|dynamic) @@ -169,7 +169,7 @@ Number of spacial streams that can use RX STBC - ^[1-3]+$ + [1-3]+ Invalid capability item @@ -248,7 +248,7 @@ Support for operation as multi user beamformee - ^(single-user-beamformer|single-user-beamformee|multi-user-beamformer|multi-user-beamformee)$ + (single-user-beamformer|single-user-beamformee|multi-user-beamformer|multi-user-beamformee) @@ -334,7 +334,7 @@ Station can provide VHT MFB in response to VHT MRQ and unsolicited VHT MFB - ^(unsolicited|both)$ + (unsolicited|both) Invalid capability item @@ -366,7 +366,7 @@ ncrease Maximum MPDU length to 11454 octets - ^(7991|11454)$ + (7991|11454) @@ -385,7 +385,7 @@ Short GI for 160 MHz - ^(80|160)$ + (80|160) @@ -403,7 +403,7 @@ Number of spacial streams that can use RX STBC - ^[1-4]+$ + [1-4]+ Invalid capability item @@ -464,7 +464,7 @@ ISO/IEC 3166-1 Country Code - ^[a-z][a-z]$ + [a-z][a-z] Invalid ISO/IEC 3166-1 Country Code @@ -529,7 +529,7 @@ MFP enforced - ^(disabled|optional|required)$ + (disabled|optional|required) disabled @@ -561,7 +561,7 @@ 802.11ac - 1300 Mbits/sec - ^(a|b|g|n|ac)$ + (a|b|g|n|ac) g @@ -650,7 +650,7 @@ Temporal Key Integrity Protocol [IEEE 802.11i/D7.0] - ^(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)$ + (GCMP-256|GCMP|CCMP-256|CCMP|TKIP) Invalid cipher selection @@ -683,7 +683,7 @@ Temporal Key Integrity Protocol [IEEE 802.11i/D7.0] - ^(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)$ + (GCMP-256|GCMP|CCMP-256|CCMP|TKIP) Invalid group cipher selection @@ -708,7 +708,7 @@ Allow both WPA and WPA2 - ^(wpa|wpa2|wpa\+wpa2|wpa3)$ + (wpa|wpa2|wpa\+wpa2|wpa3) Unknown WPA mode @@ -724,7 +724,7 @@ Passphrase of at least 8 but not more than 63 printable characters - .{8,63}$ + .{8,63} Invalid WPA pass phrase, must be 8 to 63 printable characters! @@ -752,7 +752,7 @@ Wireless access-point service set identifier (SSID) - .{1,32}$ + .{1,32} Invalid SSID @@ -776,7 +776,7 @@ Passively monitor all packets on the frequency/channel - ^(access-point|station|monitor)$ + (access-point|station|monitor) Type must be access-point, station or monitor diff --git a/interface-definitions/interfaces-wwan.xml.in b/interface-definitions/interfaces-wwan.xml.in index 3cb1645c4..3071e6091 100644 --- a/interface-definitions/interfaces-wwan.xml.in +++ b/interface-definitions/interfaces-wwan.xml.in @@ -10,7 +10,7 @@ - ^wwan[0-9]+$ + wwan[0-9]+ Wireless Modem interface must be named wwanN diff --git a/interface-definitions/nat.xml.in b/interface-definitions/nat.xml.in index f79680947..9295b631f 100644 --- a/interface-definitions/nat.xml.in +++ b/interface-definitions/nat.xml.in @@ -98,7 +98,7 @@ - ^(masquerade)$ + (masquerade) diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in index 11d986c96..b47f653c6 100644 --- a/interface-definitions/nat66.xml.in +++ b/interface-definitions/nat66.xml.in @@ -94,7 +94,7 @@ - ^(masquerade)$ + (masquerade) diff --git a/interface-definitions/netns.xml.in b/interface-definitions/netns.xml.in index 80de805fb..088985cb6 100644 --- a/interface-definitions/netns.xml.in +++ b/interface-definitions/netns.xml.in @@ -10,7 +10,7 @@ Network namespace name - ^[a-zA-Z0-9-_]{1,100} + [a-zA-Z0-9-_]{1,100} Netns name must be alphanumeric and can contain hyphens and underscores. diff --git a/interface-definitions/policy-route.xml.in b/interface-definitions/policy-route.xml.in index a1c3b50de..a10c9b08f 100644 --- a/interface-definitions/policy-route.xml.in +++ b/interface-definitions/policy-route.xml.in @@ -6,7 +6,7 @@ Policy route rule set name for IPv6 - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* 201 @@ -55,7 +55,7 @@ Policy route rule set name for IPv4 - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* 201 diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in index 1a4781397..ddb0159d5 100644 --- a/interface-definitions/policy.xml.in +++ b/interface-definitions/policy.xml.in @@ -242,7 +242,7 @@ BGP extended community-list name - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Should be an alphanumeric name @@ -291,7 +291,7 @@ BGP large-community-list name - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Should be an alphanumeric name @@ -340,7 +340,7 @@ Name of IPv4 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores @@ -408,7 +408,7 @@ Name of IPv6 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores @@ -476,7 +476,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -582,7 +582,7 @@ Prefix route - ^(macip|multicast|prefix)$ + (macip|multicast|prefix) @@ -834,7 +834,7 @@ Incomplete origin - ^(egp|igp|incomplete)$ + (egp|igp|incomplete) @@ -869,7 +869,7 @@ Match valid entries - ^(invalid|notfound|valid)$ + (invalid|notfound|valid) @@ -1070,7 +1070,7 @@ - ^(cumulative|num-multipaths)$ + (cumulative|num-multipaths) @@ -1086,7 +1086,7 @@ Based on a router-id IP address - ^(((\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b)|(\d+)):(\d+) ?)+$ + (((\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b)|(\d+)):(\d+) ?)+ Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number @@ -1103,7 +1103,7 @@ Based on a router-id IP address - ^((?:[0-9]{1,3}\.){3}[0-9]{1,3}|\d+):\d+$ + ((?:[0-9]{1,3}\.){3}[0-9]{1,3}|\d+):\d+ Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number @@ -1131,7 +1131,7 @@ - ^(unchanged|peer-address)$ + (unchanged|peer-address) @@ -1251,7 +1251,7 @@ OSPF external type 2 metric - ^(type-1|type-2)$ + (type-1|type-2) @@ -1274,7 +1274,7 @@ Incomplete origin - ^(igp|egp|incomplete)$ + (igp|egp|incomplete) diff --git a/interface-definitions/protocols-bfd.xml.in b/interface-definitions/protocols-bfd.xml.in index a9957d884..edbac8d0e 100644 --- a/interface-definitions/protocols-bfd.xml.in +++ b/interface-definitions/protocols-bfd.xml.in @@ -73,7 +73,7 @@ Name of BFD profile - ^[-_a-zA-Z0-9]{1,32}$ + [-_a-zA-Z0-9]{1,32} diff --git a/interface-definitions/protocols-nhrp.xml.in b/interface-definitions/protocols-nhrp.xml.in index 9dd9d3389..7de3704ce 100644 --- a/interface-definitions/protocols-nhrp.xml.in +++ b/interface-definitions/protocols-nhrp.xml.in @@ -12,7 +12,7 @@ Tunnel for NHRP [REQUIRED] - ^tun[0-9]+$ + tun[0-9]+ tunN @@ -85,7 +85,7 @@ dynamic nhs - ^(dynamic|nhs)$ + (dynamic|nhs) diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in index d3be4e1af..bbb88aef1 100644 --- a/interface-definitions/protocols-rip.xml.in +++ b/interface-definitions/protocols-rip.xml.in @@ -78,7 +78,7 @@ MD5 Key (16 characters or less) - ^[^[:space:]]{1,16}$ + [^[:space:]]{1,16} Password must be 16 characters or less @@ -93,7 +93,7 @@ Plain text password (16 characters or less) - ^[^[:space:]]{1,16}$ + [^[:space:]]{1,16} Password must be 16 characters or less diff --git a/interface-definitions/service-ids-ddos-protection.xml.in b/interface-definitions/service-ids-ddos-protection.xml.in index ff4c1c24e..5e65d3106 100644 --- a/interface-definitions/service-ids-ddos-protection.xml.in +++ b/interface-definitions/service-ids-ddos-protection.xml.in @@ -25,7 +25,7 @@ in out - ^(in|out)$ + (in|out) diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in index 584f687c7..32efa7323 100644 --- a/interface-definitions/service_conntrack-sync.xml.in +++ b/interface-definitions/service_conntrack-sync.xml.in @@ -39,7 +39,7 @@ Sync Datagram Congestion Control Protocol entries - ^(tcp|udp|icmp|icmp6|sctp|dccp)$ + (tcp|udp|icmp|icmp6|sctp|dccp) Allowed protocols: tcp udp icmp or sctp @@ -68,7 +68,7 @@ all ftp sip h323 nfs sqlnet - ^(all|ftp|sip|h323|nfs|sqlnet)$ + (all|ftp|sip|h323|nfs|sqlnet) Invalid protocol diff --git a/interface-definitions/service_console-server.xml.in b/interface-definitions/service_console-server.xml.in index 549edb813..e9591ad87 100644 --- a/interface-definitions/service_console-server.xml.in +++ b/interface-definitions/service_console-server.xml.in @@ -23,7 +23,7 @@ USB based serial interface - ^(ttyS\d+|usb\d+b.*p.*)$ + (ttyS\d+|usb\d+b.*p.*) @@ -35,7 +35,7 @@ 300 1200 2400 4800 9600 19200 38400 57600 115200 - ^(300|1200|2400|4800|9600|19200|38400|57600|115200)$ + (300|1200|2400|4800|9600|19200|38400|57600|115200) @@ -70,7 +70,7 @@ even odd none - ^(even|odd|none)$ + (even|odd|none) none diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in index 1325ba10d..e222467b1 100644 --- a/interface-definitions/service_ipoe-server.xml.in +++ b/interface-definitions/service_ipoe-server.xml.in @@ -23,7 +23,7 @@ L2 L3 - ^(L2|L3)$ + (L2|L3) L2 @@ -42,7 +42,7 @@ shared vlan - ^(shared|vlan)$ + (shared|vlan) shared @@ -141,7 +141,7 @@ local radius noauth - ^(local|radius|noauth)$ + (local|radius|noauth) local diff --git a/interface-definitions/service_monitoring_telegraf.xml.in b/interface-definitions/service_monitoring_telegraf.xml.in index 7db9de9f8..01bc16fc9 100644 --- a/interface-definitions/service_monitoring_telegraf.xml.in +++ b/interface-definitions/service_monitoring_telegraf.xml.in @@ -22,7 +22,7 @@ Authentication organization for InfluxDB v2 [REQUIRED] - ^[a-zA-Z][1-9a-zA-Z@_\-.]{2,50}$ + [a-zA-Z][1-9a-zA-Z@_\-.]{2,50} Organization name must be alphanumeric and can contain hyphens, underscores and at symbol. @@ -35,7 +35,7 @@ Authentication token - ^[a-zA-Z0-9-_]{86}==$ + [a-zA-Z0-9-_]{86}== Token must be 88 characters long and must contain only [a-zA-Z0-9-_] and '==' characters. @@ -79,7 +79,7 @@ Telegraf internal statistics - ^(all|hardware-utilization|logs|network|system|telegraf)$ + (all|hardware-utilization|logs|network|system|telegraf) @@ -93,7 +93,7 @@ Remote URL to InfluxDB v2 - ^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}?(\/.*)?$ + (http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}?(\/.*)? Incorrect URL format. diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 97952d882..50f42849b 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -32,7 +32,7 @@ ifname ifname:mac - ^(ifname|ifname:mac)$ + (ifname|ifname:mac) Invalid Called-Station-Id format @@ -108,7 +108,7 @@ Acceptable rate of connections (e.g. 1/min, 60/sec) - [0-9]+\/(min|sec)$ + [0-9]+\/(min|sec) illegal value @@ -171,7 +171,7 @@ IPv4 (IPCP) negotiation algorithm - ^(deny|allow|prefer|require)$ + (deny|allow|prefer|require) invalid value @@ -276,7 +276,7 @@ control sessions count - ^(deny|disable|replace)$ + (deny|disable|replace) Invalid value diff --git a/interface-definitions/service_router-advert.xml.in b/interface-definitions/service_router-advert.xml.in index ce1da85aa..bb11e9cd0 100644 --- a/interface-definitions/service_router-advert.xml.in +++ b/interface-definitions/service_router-advert.xml.in @@ -70,7 +70,7 @@ Default router has high preference - ^(low|medium|high)$ + (low|medium|high) Default preference must be low, medium or high @@ -170,7 +170,7 @@ - ^(infinity)$ + (infinity) 1800 @@ -194,7 +194,7 @@ Route has high preference - ^(low|medium|high)$ + (low|medium|high) Route preference must be low, medium or high @@ -248,7 +248,7 @@ - ^(infinity)$ + (infinity) 14400 @@ -269,7 +269,7 @@ - ^(infinity)$ + (infinity) 2592000 diff --git a/interface-definitions/service_upnp.xml.in b/interface-definitions/service_upnp.xml.in index 7cfe1f02e..a129b7260 100644 --- a/interface-definitions/service_upnp.xml.in +++ b/interface-definitions/service_upnp.xml.in @@ -211,7 +211,7 @@ allow deny - ^(allow|deny)$ + (allow|deny) diff --git a/interface-definitions/service_webproxy.xml.in b/interface-definitions/service_webproxy.xml.in index 89c4c3910..9a75bc27d 100644 --- a/interface-definitions/service_webproxy.xml.in +++ b/interface-definitions/service_webproxy.xml.in @@ -136,7 +136,7 @@ Lightweight Directory Access Protocol - ^(ldap)$ + (ldap) The only supported method currently is LDAP @@ -234,7 +234,7 @@ Peer is a member of a multicast group - ^(parent|sibling|multicast)$ + (parent|sibling|multicast) parent @@ -368,7 +368,7 @@ image/gif www/mime application/macbinary application/oda application/octet-stream application/pdf application/postscript application/postscript application/postscript text/rtf application/octet-stream application/octet-stream application/x-tar application/x-csh application/x-dvi application/x-hdf application/x-latex text/plain application/x-netcdf application/x-netcdf application/x-sh application/x-tcl application/x-tex application/x-texinfo application/x-texinfo application/x-troff application/x-troff application/x-troff application/x-troff-man application/x-troff-me application/x-troff-ms application/x-wais-source application/zip application/x-bcpio application/x-cpio application/x-gtar application/x-rpm application/x-shar application/x-sv4cpio application/x-sv4crc application/x-tar application/x-ustar audio/basic audio/basic audio/mpeg audio/mpeg audio/mpeg audio/x-aiff audio/x-aiff audio/x-aiff audio/x-wav image/bmp image/ief image/jpeg image/jpeg image/jpeg image/tiff image/tiff image/x-cmu-raster image/x-portable-anymap image/x-portable-bitmap image/x-portable-graymap image/x-portable-pixmap image/x-rgb image/x-xbitmap image/x-xpixmap image/x-xwindowdump text/html text/html text/css application/x-javascript text/plain text/plain text/plain text/plain text/plain text/plain text/plain text/plain text/plain text/richtext text/tab-separated-values text/x-setext video/mpeg video/mpeg video/mpeg video/quicktime video/quicktime video/x-msvideo video/x-sgi-movie application/mac-compactpro application/mac-binhex40 application/macwriteii application/msword application/msword application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.lotus-1-2-3 application/vnd.mif application/x-stuffit application/pict application/pict application/x-arj-compressed application/x-lha-compressed application/x-lha-compressed application/x-deflate text/plain application/octet-stream application/octet-stream image/png application/octet-stream application/x-xpinstall application/octet-stream text/plain application/x-director application/x-director application/x-director image/vnd.djvu image/vnd.djvu application/octet-stream application/octet-stream application/andrew-inset x-conference/x-cooltalk model/iges model/iges audio/midi audio/midi audio/midi model/mesh model/mesh video/vnd.mpegurl chemical/x-pdb application/x-chess-pgn audio/x-realaudio audio/x-pn-realaudio audio/x-pn-realaudio text/sgml text/sgml application/x-koan application/x-koan application/x-koan application/x-koan application/smil application/smil application/octet-stream application/x-futuresplash application/x-shockwave-flash application/x-cdlink model/vrml image/vnd.wap.wbmp application/vnd.wap.wbxml application/vnd.wap.wmlc application/vnd.wap.wmlscriptc application/vnd.wap.wmlscript application/xhtml application/xhtml text/xml text/xml chemical/x-xyz text/plain - ^(image/gif|www/mime|application/macbinary|application/oda|application/octet-stream|application/pdf|application/postscript|application/postscript|application/postscript|text/rtf|application/octet-stream|application/octet-stream|application/x-tar|application/x-csh|application/x-dvi|application/x-hdf|application/x-latex|text/plain|application/x-netcdf|application/x-netcdf|application/x-sh|application/x-tcl|application/x-tex|application/x-texinfo|application/x-texinfo|application/x-troff|application/x-troff|application/x-troff|application/x-troff-man|application/x-troff-me|application/x-troff-ms|application/x-wais-source|application/zip|application/x-bcpio|application/x-cpio|application/x-gtar|application/x-rpm|application/x-shar|application/x-sv4cpio|application/x-sv4crc|application/x-tar|application/x-ustar|audio/basic|audio/basic|audio/mpeg|audio/mpeg|audio/mpeg|audio/x-aiff|audio/x-aiff|audio/x-aiff|audio/x-wav|image/bmp|image/ief|image/jpeg|image/jpeg|image/jpeg|image/tiff|image/tiff|image/x-cmu-raster|image/x-portable-anymap|image/x-portable-bitmap|image/x-portable-graymap|image/x-portable-pixmap|image/x-rgb|image/x-xbitmap|image/x-xpixmap|image/x-xwindowdump|text/html|text/html|text/css|application/x-javascript|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/richtext|text/tab-separated-values|text/x-setext|video/mpeg|video/mpeg|video/mpeg|video/quicktime|video/quicktime|video/x-msvideo|video/x-sgi-movie|application/mac-compactpro|application/mac-binhex40|application/macwriteii|application/msword|application/msword|application/vnd.ms-excel|application/vnd.ms-powerpoint|application/vnd.lotus-1-2-3|application/vnd.mif|application/x-stuffit|application/pict|application/pict|application/x-arj-compressed|application/x-lha-compressed|application/x-lha-compressed|application/x-deflate|text/plain|application/octet-stream|application/octet-stream|image/png|application/octet-stream|application/x-xpinstall|application/octet-stream|text/plain|application/x-director|application/x-director|application/x-director|image/vnd.djvu|image/vnd.djvu|application/octet-stream|application/octet-stream|application/andrew-inset|x-conference/x-cooltalk|model/iges|model/iges|audio/midi|audio/midi|audio/midi|model/mesh|model/mesh|video/vnd.mpegurl|chemical/x-pdb|application/x-chess-pgn|audio/x-realaudio|audio/x-pn-realaudio|audio/x-pn-realaudio|text/sgml|text/sgml|application/x-koan|application/x-koan|application/x-koan|application/x-koan|application/smil|application/smil|application/octet-stream|application/x-futuresplash|application/x-shockwave-flash|application/x-cdlink|model/vrml|image/vnd.wap.wbmp|application/vnd.wap.wbxml|application/vnd.wap.wmlc|application/vnd.wap.wmlscriptc|application/vnd.wap.wmlscript|application/xhtml|application/xhtml|text/xml|text/xml|chemical/x-xyz|text/plain)$ + (image/gif|www/mime|application/macbinary|application/oda|application/octet-stream|application/pdf|application/postscript|application/postscript|application/postscript|text/rtf|application/octet-stream|application/octet-stream|application/x-tar|application/x-csh|application/x-dvi|application/x-hdf|application/x-latex|text/plain|application/x-netcdf|application/x-netcdf|application/x-sh|application/x-tcl|application/x-tex|application/x-texinfo|application/x-texinfo|application/x-troff|application/x-troff|application/x-troff|application/x-troff-man|application/x-troff-me|application/x-troff-ms|application/x-wais-source|application/zip|application/x-bcpio|application/x-cpio|application/x-gtar|application/x-rpm|application/x-shar|application/x-sv4cpio|application/x-sv4crc|application/x-tar|application/x-ustar|audio/basic|audio/basic|audio/mpeg|audio/mpeg|audio/mpeg|audio/x-aiff|audio/x-aiff|audio/x-aiff|audio/x-wav|image/bmp|image/ief|image/jpeg|image/jpeg|image/jpeg|image/tiff|image/tiff|image/x-cmu-raster|image/x-portable-anymap|image/x-portable-bitmap|image/x-portable-graymap|image/x-portable-pixmap|image/x-rgb|image/x-xbitmap|image/x-xpixmap|image/x-xwindowdump|text/html|text/html|text/css|application/x-javascript|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/plain|text/richtext|text/tab-separated-values|text/x-setext|video/mpeg|video/mpeg|video/mpeg|video/quicktime|video/quicktime|video/x-msvideo|video/x-sgi-movie|application/mac-compactpro|application/mac-binhex40|application/macwriteii|application/msword|application/msword|application/vnd.ms-excel|application/vnd.ms-powerpoint|application/vnd.lotus-1-2-3|application/vnd.mif|application/x-stuffit|application/pict|application/pict|application/x-arj-compressed|application/x-lha-compressed|application/x-lha-compressed|application/x-deflate|text/plain|application/octet-stream|application/octet-stream|image/png|application/octet-stream|application/x-xpinstall|application/octet-stream|text/plain|application/x-director|application/x-director|application/x-director|image/vnd.djvu|image/vnd.djvu|application/octet-stream|application/octet-stream|application/andrew-inset|x-conference/x-cooltalk|model/iges|model/iges|audio/midi|audio/midi|audio/midi|model/mesh|model/mesh|video/vnd.mpegurl|chemical/x-pdb|application/x-chess-pgn|audio/x-realaudio|audio/x-pn-realaudio|audio/x-pn-realaudio|text/sgml|text/sgml|application/x-koan|application/x-koan|application/x-koan|application/x-koan|application/smil|application/smil|application/octet-stream|application/x-futuresplash|application/x-shockwave-flash|application/x-cdlink|model/vrml|image/vnd.wap.wbmp|application/vnd.wap.wbxml|application/vnd.wap.wmlc|application/vnd.wap.wmlscriptc|application/vnd.wap.wmlscript|application/xhtml|application/xhtml|text/xml|text/xml|chemical/x-xyz|text/plain) @@ -484,7 +484,7 @@ Name of source group - ^[^0-9] + [^0-9] URL-filter source-group cannot start with a number! @@ -598,7 +598,7 @@ All days of the week - ^(Sun|Mon|Tue|Wed|Thu|Fri|Sat|weekdays|weekend|all)$ + (Sun|Mon|Tue|Wed|Thu|Fri|Sat|weekdays|weekend|all) @@ -611,7 +611,7 @@ - ^(\d\d:\d\d)-(\d\d:\d\d)$ + (\d\d:\d\d)-(\d\d:\d\d) Expected time format hh:mm - hh:mm in 24hr time diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in index b9e0f4cc5..b4f72589e 100644 --- a/interface-definitions/snmp.xml.in +++ b/interface-definitions/snmp.xml.in @@ -13,7 +13,7 @@ Community name - ^[a-zA-Z0-9\-_]{1,100}$ + [a-zA-Z0-9\-_]{1,100} Community string is limited to alphanumerical characters only with a total lenght of 100 @@ -33,7 +33,7 @@ Read-Write - ^(ro|rw)$ + (ro|rw) Authorization type must be either 'rw' or 'ro' @@ -72,7 +72,7 @@ Contact information - ^.{1,255}$ + .{1,255} Contact information is limited to 255 characters or less @@ -81,7 +81,7 @@ Description information - ^.{1,255}$ + .{1,255} Description is limited to 255 characters or less @@ -116,7 +116,7 @@ Location information - ^.{1,255}$ + .{1,255} Location is limited to 255 characters or less @@ -132,7 +132,7 @@ Enable routing table OIDs (ipCidrRouteTable inetCidrRouteTable) - ^(route-table)$ + (route-table) OID must be 'route-table' @@ -202,7 +202,7 @@ Specifies the EngineID that uniquely identify an agent (e.g. 000000000000000000000002) - ^([0-9a-f][0-9a-f]){1,18}$ + ([0-9a-f][0-9a-f]){1,18} ID must contain an even number (from 2 to 36) of hex digits @@ -233,7 +233,7 @@ Messages are authenticated and encrypted (authPriv) - ^(noauth|auth|priv)$ + (noauth|auth|priv) auth @@ -274,7 +274,7 @@ Defines the encrypted key for authentication - ^[0-9a-f]*$ + [0-9a-f]* Encrypted key must only contain hex digits @@ -283,7 +283,7 @@ Defines the clear text key for authentication - ^.{8,}$ + .{8,} Key must contain 8 or more characters @@ -304,7 +304,7 @@ Defines the encrypted key for privacy protocol - ^[0-9a-f]*$ + [0-9a-f]* Encrypted key must only contain hex digits @@ -313,7 +313,7 @@ Defines the clear text key for privacy protocol - ^.{8,}$ + .{8,} Key must contain 8 or more characters @@ -337,7 +337,7 @@ Use TRAP - ^(inform|trap)$ + (inform|trap) inform @@ -356,7 +356,7 @@ Specifies the user with name username - [^\(\)\|\-]+$ + [^\(\)\|\-]+ Illegal characters in name @@ -370,7 +370,7 @@ Defines the encrypted key for authentication - ^[0-9a-f]*$ + [0-9a-f]* Encrypted key must only contain hex digits @@ -379,7 +379,7 @@ Defines the clear text key for authentication - ^.{8,}$ + .{8,} Key must contain 8 or more characters @@ -405,7 +405,7 @@ Defines the encrypted key for privacy protocol - ^[0-9a-f]*$ + [0-9a-f]* Encrypted key must only contain hex digits @@ -414,7 +414,7 @@ Defines the clear text key for privacy protocol - ^.{8,}$ + .{8,} Key must contain 8 or more characters @@ -428,7 +428,7 @@ Specifies the view with name viewname - [^\(\)\|\-]+$ + [^\(\)\|\-]+ Illegal characters in name @@ -437,7 +437,7 @@ Specifies the oid - ^[0-9]+(\.[0-9]+)*$ + [0-9]+(\.[0-9]+)* OID must start from a number @@ -451,7 +451,7 @@ Defines a bit-mask that is indicating which subidentifiers of the associated subtree OID should be regarded as significant - ^[0-9a-f]{2}([\.:][0-9a-f]{2})*$ + [0-9a-f]{2}([\.:][0-9a-f]{2})* MASK is a list of hex octets, separated by '.' or ':' @@ -471,7 +471,7 @@ Extension name - ^[a-z0-9\.\-\_]+ + [a-z0-9\.\-\_]+ Script extension contains invalid characters @@ -483,7 +483,7 @@ - ^[a-z0-9\.\-\_\/]+ + [a-z0-9\.\-\_\/]+ Script extension contains invalid characters diff --git a/interface-definitions/system-conntrack.xml.in b/interface-definitions/system-conntrack.xml.in index 65edab839..14f12b569 100644 --- a/interface-definitions/system-conntrack.xml.in +++ b/interface-definitions/system-conntrack.xml.in @@ -252,7 +252,7 @@ Do not allow tracking of previously established connections - ^(enable|disable)$ + (enable|disable) enable diff --git a/interface-definitions/system-console.xml.in b/interface-definitions/system-console.xml.in index 2897e5e97..5acd3e90b 100644 --- a/interface-definitions/system-console.xml.in +++ b/interface-definitions/system-console.xml.in @@ -28,7 +28,7 @@ Xen console - ^(ttyS[0-9]+|hvc[0-9]+|usb[0-9]+b.*)$ + (ttyS[0-9]+|hvc[0-9]+|usb[0-9]+b.*) @@ -71,7 +71,7 @@ 115200 bps - ^(1200|2400|4800|9600|19200|38400|57600|115200)$ + (1200|2400|4800|9600|19200|38400|57600|115200) 115200 diff --git a/interface-definitions/system-lcd.xml.in b/interface-definitions/system-lcd.xml.in index 4c9d5c92e..9b1a15317 100644 --- a/interface-definitions/system-lcd.xml.in +++ b/interface-definitions/system-lcd.xml.in @@ -39,7 +39,7 @@ Lanner, Watchguard, Nexcom NSA, Sophos UTM appliances - ^(cfa-533|cfa-631|cfa-633|cfa-635|hd44780|sdec)$ + (cfa-533|cfa-631|cfa-633|cfa-635|hd44780|sdec) @@ -59,7 +59,7 @@ TTY device name, USB based - ^(ttyS[0-9]+|usb[0-9]+b.*)$ + (ttyS[0-9]+|usb[0-9]+b.*) diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in index a5519ee88..24eeee355 100644 --- a/interface-definitions/system-login.xml.in +++ b/interface-definitions/system-login.xml.in @@ -12,7 +12,7 @@ Local user account information - ^[-_a-zA-Z0-9.]{1,100} + [-_a-zA-Z0-9.]{1,100} Username contains illegal characters or\nexceeds 100 character limitation. @@ -27,7 +27,7 @@ Encrypted password (\*|\!) - [a-zA-Z0-9\.\/]{13}$ + [a-zA-Z0-9\.\/]{13} \$1\$[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{22} \$5\$[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{43} \$6\$[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{86} @@ -90,7 +90,7 @@ - ^(ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519)$ + (ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519) @@ -102,7 +102,7 @@ Full name of the user (use quotes for names with spaces) - [^:]*$ + [^:]* Cannot use ':' in full name diff --git a/interface-definitions/system-option.xml.in b/interface-definitions/system-option.xml.in index 75fa67271..8cd25799b 100644 --- a/interface-definitions/system-option.xml.in +++ b/interface-definitions/system-option.xml.in @@ -27,7 +27,7 @@ Poweroff system - ^(ignore|reboot|poweroff)$ + (ignore|reboot|poweroff) Must be ignore, reboot, or poweroff @@ -84,7 +84,7 @@ Tune for low network latency - ^(throughput|latency)$ + (throughput|latency) diff --git a/interface-definitions/system-proxy.xml.in b/interface-definitions/system-proxy.xml.in index ade168522..1c06b347f 100644 --- a/interface-definitions/system-proxy.xml.in +++ b/interface-definitions/system-proxy.xml.in @@ -11,7 +11,7 @@ Proxy URL - http:\/\/[a-z0-9\.]+$ + http:\/\/[a-z0-9\.]+ @@ -20,7 +20,7 @@ Proxy username - [a-z0-9-_\.]{1,100}$ + [a-z0-9-_\.]{1,100} diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in index 9280a43c8..480cb1ca6 100644 --- a/interface-definitions/system-syslog.xml.in +++ b/interface-definitions/system-syslog.xml.in @@ -28,7 +28,7 @@ auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all - ^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$ + (auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all) Invalid facility type @@ -132,7 +132,7 @@ emerg alert crit err warning notice info debug all - ^(emerg|alert|crit|err|warning|notice|info|debug|all)$ + (emerg|alert|crit|err|warning|notice|info|debug|all) Invalid loglevel @@ -203,7 +203,7 @@ auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all - ^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$ + (auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all) Invalid facility type @@ -315,7 +315,7 @@ udp tcp - ^(udp|tcp)$ + (udp|tcp) invalid protocol name @@ -327,7 +327,7 @@ emerg alert crit err warning notice info debug all - ^(emerg|alert|crit|err|warning|notice|info|debug|all)$ + (emerg|alert|crit|err|warning|notice|info|debug|all) Invalid loglevel @@ -422,7 +422,7 @@ auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all - ^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$ + (auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all) Invalid facility type @@ -526,7 +526,7 @@ emerg alert crit err warning notice info debug all - ^(emerg|alert|crit|err|warning|notice|info|debug|all)$ + (emerg|alert|crit|err|warning|notice|info|debug|all) Invalid loglevel @@ -633,7 +633,7 @@ auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all - ^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$ + (auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all) Invalid facility type @@ -737,7 +737,7 @@ emerg alert crit err warning notice info debug all - ^(emerg|alert|crit|err|warning|notice|info|debug|all)$ + (emerg|alert|crit|err|warning|notice|info|debug|all) Invalid loglevel @@ -794,7 +794,7 @@ auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all - ^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$ + (auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all) Invalid facility type @@ -898,7 +898,7 @@ emerg alert crit err warning notice info debug all - ^(emerg|alert|crit|err|warning|notice|info|debug|all)$ + (emerg|alert|crit|err|warning|notice|info|debug|all) Invalid loglevel diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in index a86951ce8..555ba689f 100644 --- a/interface-definitions/vpn_ipsec.xml.in +++ b/interface-definitions/vpn_ipsec.xml.in @@ -37,7 +37,7 @@ Enable ESP compression - ^(disable|enable)$ + (disable|enable) disable @@ -94,7 +94,7 @@ Transport mode - ^(tunnel|transport)$ + (tunnel|transport) tunnel @@ -202,7 +202,7 @@ Disable PFS - ^(enable|dh-group1|dh-group2|dh-group5|dh-group14|dh-group15|dh-group16|dh-group17|dh-group18|dh-group19|dh-group20|dh-group21|dh-group22|dh-group23|dh-group24|dh-group25|dh-group26|dh-group27|dh-group28|dh-group29|dh-group30|dh-group31|dh-group32|disable)$ + (enable|dh-group1|dh-group2|dh-group5|dh-group14|dh-group15|dh-group16|dh-group17|dh-group18|dh-group19|dh-group20|dh-group21|dh-group22|dh-group23|dh-group24|dh-group25|dh-group26|dh-group27|dh-group28|dh-group29|dh-group30|dh-group31|dh-group32|disable) enable @@ -246,7 +246,7 @@ Attempt to re-negotiate the connection immediately - ^(none|hold|restart)$ + (none|hold|restart) @@ -274,7 +274,7 @@ Attempt to re-negotiate the connection immediately - ^(hold|clear|restart)$ + (hold|clear|restart) @@ -321,7 +321,7 @@ Disable remote host re-authenticaton during an IKE rekey - ^(yes|no)$ + (yes|no) @@ -340,7 +340,7 @@ Use IKEv2 for key exchange - ^(ikev1|ikev2)$ + (ikev1|ikev2) @@ -372,7 +372,7 @@ Disable MOBIKE - ^(enable|disable)$ + (enable|disable) enable @@ -392,7 +392,7 @@ Use the aggressive mode (insecure, not recommended) - ^(main|aggressive)$ + (main|aggressive) main @@ -501,7 +501,7 @@ Diffie-Hellman group 32 (curve448) - ^(1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)$ + (1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32) 2 @@ -628,7 +628,7 @@ Any subsystem - ^(dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|lib|esp|tls|tnc|imc|imv|pts|any)$ + (dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|lib|esp|tls|tnc|imc|imv|pts|any) @@ -747,7 +747,7 @@ Use EAP-RADIUS authentication - ^(eap-tls|eap-mschapv2|eap-radius)$ + (eap-tls|eap-mschapv2|eap-radius) eap-mschapv2 @@ -768,7 +768,7 @@ Use x.509 certificate - ^(pre-shared-secret|x509)$ + (pre-shared-secret|x509) x509 @@ -840,7 +840,7 @@ Delete any existing connection if a new one for the same user gets established - ^(never|keep|replace)$ + (never|keep|replace) @@ -976,7 +976,7 @@ Use x.509 certificate - ^(pre-shared-secret|rsa|x509)$ + (pre-shared-secret|rsa|x509) @@ -1017,7 +1017,7 @@ Load the connection only - ^(initiate|respond|none)$ + (initiate|respond|none) @@ -1046,7 +1046,7 @@ Do not force UDP encapsulation - ^(enable|disable)$ + (enable|disable) @@ -1070,7 +1070,7 @@ Inherit the reauth configuration form your IKE-group - ^(yes|no|inherit)$ + (yes|no|inherit) diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 9ca7b1fad..f734283e7 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -72,7 +72,7 @@ Use X.509 certificate for IPsec authentication - ^(pre-shared-secret|x509)$ + (pre-shared-secret|x509) pre-shared-secret x509 @@ -167,7 +167,7 @@ Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2]. - ^(pap|chap|mschap|mschap-v2)$ + (pap|chap|mschap|mschap-v2) pap chap mschap mschap-v2 diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in index 05458ed34..7981c3fa2 100644 --- a/interface-definitions/vpn_openconnect.xml.in +++ b/interface-definitions/vpn_openconnect.xml.in @@ -34,7 +34,7 @@ Password (first) + OTP local authentication - ^(password|otp|password-otp)$ + (password|otp|password-otp) Invalid authentication mode. Must be one of: password, otp or password-otp diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in index 0d1690013..28a53acb9 100644 --- a/interface-definitions/vpn_pptp.xml.in +++ b/interface-definitions/vpn_pptp.xml.in @@ -75,7 +75,7 @@ ask client for mppe, if it rejects drop connection - ^(deny|prefer|require)$ + (deny|prefer|require) deny prefer require diff --git a/interface-definitions/zone-policy.xml.in b/interface-definitions/zone-policy.xml.in index eac63fa6b..8af0dcfb6 100644 --- a/interface-definitions/zone-policy.xml.in +++ b/interface-definitions/zone-policy.xml.in @@ -14,7 +14,7 @@ Zone name - ^[a-zA-Z0-9][\w\-\.]*$ + [a-zA-Z0-9][\w\-\.]* @@ -34,7 +34,7 @@ Drop and notify source - ^(drop|reject)$ + (drop|reject) drop @@ -105,7 +105,7 @@ Drop silently - ^(accept|drop)$ + (accept|drop) -- cgit v1.2.3