summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-05-17 18:48:06 +0200
committerChristian Breunig <christian@breunig.cc>2023-05-17 18:48:06 +0200
commitf06fdc347c85b317b1b0667e0701d1a5d1332ae4 (patch)
tree45e7702c2961991ac5cf116af046927ca6e98320
parent9e9794a763e7e56a3a4c0001ea2b5bbc46bbb681 (diff)
downloadvyos-1x-f06fdc347c85b317b1b0667e0701d1a5d1332ae4.tar.gz
vyos-1x-f06fdc347c85b317b1b0667e0701d1a5d1332ae4.zip
reverse-proxy: T5222: use common XML building blocks for alpha numeric constraint
-rw-r--r--interface-definitions/load-balancing-haproxy.xml.in9
1 files changed, 4 insertions, 5 deletions
diff --git a/interface-definitions/load-balancing-haproxy.xml.in b/interface-definitions/load-balancing-haproxy.xml.in
index 268f4cd18..3747c589e 100644
--- a/interface-definitions/load-balancing-haproxy.xml.in
+++ b/interface-definitions/load-balancing-haproxy.xml.in
@@ -11,7 +11,7 @@
<properties>
<help>Frontend name</help>
<constraint>
- <regex>[-_a-zA-Z0-9]+</regex>
+ #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
</constraint>
<constraintErrorMessage>Server name must be alphanumeric and can contain hyphen and underscores</constraintErrorMessage>
</properties>
@@ -20,7 +20,7 @@
<properties>
<help>Backend member</help>
<constraint>
- <regex>[-_a-zA-Z0-9]+</regex>
+ #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
</constraint>
<constraintErrorMessage>Backend name must be alphanumeric and can contain hyphen and underscores</constraintErrorMessage>
<valueHelp>
@@ -58,7 +58,7 @@
<properties>
<help>Backend name</help>
<constraint>
- <regex>[-_a-zA-Z0-9]+</regex>
+ #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
</constraint>
<constraintErrorMessage>Backend name must be alphanumeric and can contain hyphen and underscores</constraintErrorMessage>
</properties>
@@ -206,8 +206,7 @@
<description>dhe-rsa-aes256-gcm-sha384</description>
</valueHelp>
<constraint>
- <regex>(ecdhe-ecdsa-aes128-gcm-sha256|ecdhe-rsa-aes128-gcm-sha256|ecdhe-ecdsa-aes256-gcm-sha384|ecdhe-rsa-aes256-gcm-sha384|ecdhe-ecdsa-chacha20-poly1305|ecdhe-rsa-chacha20-poly1305|dhe-rsa-aes128-gcm-sha256|dhe-rsa-aes256-gcm-sha384)
- </regex>
+ <regex>(ecdhe-ecdsa-aes128-gcm-sha256|ecdhe-rsa-aes128-gcm-sha256|ecdhe-ecdsa-aes256-gcm-sha384|ecdhe-rsa-aes256-gcm-sha384|ecdhe-ecdsa-chacha20-poly1305|ecdhe-rsa-chacha20-poly1305|dhe-rsa-aes128-gcm-sha256|dhe-rsa-aes256-gcm-sha384)</regex>
</constraint>
<multi/>
</properties>