diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-11-09 15:06:33 -0600 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-12-01 05:42:22 +0000 |
| commit | 3e7575594016c28084cc6c89b0c483f78e5a7b4a (patch) | |
| tree | e679f4251c5acc84881f1e8a979ef4de4ff3e8ad | |
| parent | 652e235894aeae46765ea9fbbe2208578aaa7a8c (diff) | |
| download | vyos-1x-3e7575594016c28084cc6c89b0c483f78e5a7b4a.tar.gz vyos-1x-3e7575594016c28084cc6c89b0c483f78e5a7b4a.zip | |
T5727: Use native URL validator instead of regex-based validator
Replace regex-based URL validator with native validator from vyos-utils.
Also, move `include/url.xml.i` to `include/url-http-https.xml.i` to
reflect the fact that it is used only for HTTP(S) URLs.
(cherry picked from commit 64322b19d6968195a6dc7c82e7e22126072377f5)
| -rw-r--r-- | interface-definitions/dns-dynamic.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/include/url-http-https.xml.i | 15 | ||||
| -rw-r--r-- | interface-definitions/include/url.xml.i | 15 | ||||
| -rw-r--r-- | interface-definitions/service-monitoring-telegraf.xml.in | 6 | ||||
| -rw-r--r-- | interface-definitions/system-update-check.xml.in | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in index a0720f3aa..9f560b063 100644 --- a/interface-definitions/dns-dynamic.xml.in +++ b/interface-definitions/dns-dynamic.xml.in @@ -38,7 +38,7 @@ <help>Options when using HTTP(S) web request to obtain the IP address</help> </properties> <children> - #include <include/url.xml.i> + #include <include/url-http-https.xml.i> <leafNode name="skip"> <properties> <help>Pattern to skip from the HTTP(S) respose</help> diff --git a/interface-definitions/include/url-http-https.xml.i b/interface-definitions/include/url-http-https.xml.i new file mode 100644 index 000000000..f763c2bb2 --- /dev/null +++ b/interface-definitions/include/url-http-https.xml.i @@ -0,0 +1,15 @@ +<!-- include start from url-http-https.xml.i --> +<leafNode name="url"> + <properties> + <help>Remote URL</help> + <valueHelp> + <format>url</format> + <description>Remote HTTP(S) URL</description> + </valueHelp> + <constraint> + <validator name="url" argument="--scheme http --scheme https"/> + </constraint> + <constraintErrorMessage>Invalid HTTP(S) URL format</constraintErrorMessage> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/include/url.xml.i b/interface-definitions/include/url.xml.i deleted file mode 100644 index caa6f67bd..000000000 --- a/interface-definitions/include/url.xml.i +++ /dev/null @@ -1,15 +0,0 @@ -<!-- include start from url.xml.i --> -<leafNode name="url"> - <properties> - <help>Remote URL</help> - <valueHelp> - <format>url</format> - <description>Remote URL</description> - </valueHelp> - <constraint> - <regex>^https?:\/\/?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\:[0-9]+)*(\/.*)?</regex> - </constraint> - <constraintErrorMessage>Incorrect URL format</constraintErrorMessage> - </properties> -</leafNode> -<!-- include end --> diff --git a/interface-definitions/service-monitoring-telegraf.xml.in b/interface-definitions/service-monitoring-telegraf.xml.in index ae0bae900..4d694114a 100644 --- a/interface-definitions/service-monitoring-telegraf.xml.in +++ b/interface-definitions/service-monitoring-telegraf.xml.in @@ -53,7 +53,7 @@ </properties> <defaultValue>main</defaultValue> </leafNode> - #include <include/url.xml.i> + #include <include/url-http-https.xml.i> #include <include/port-number.xml.i> <leafNode name="port"> <defaultValue>8086</defaultValue> @@ -145,7 +145,7 @@ <constraintErrorMessage>Table is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage> </properties> </leafNode> - #include <include/url.xml.i> + #include <include/url-http-https.xml.i> </children> </node> <leafNode name="source"> @@ -271,7 +271,7 @@ </leafNode> </children> </node> - #include <include/url.xml.i> + #include <include/url-http-https.xml.i> </children> </node> #include <include/interface/vrf.xml.i> diff --git a/interface-definitions/system-update-check.xml.in b/interface-definitions/system-update-check.xml.in index e4d7041ec..a7d754003 100644 --- a/interface-definitions/system-update-check.xml.in +++ b/interface-definitions/system-update-check.xml.in @@ -14,7 +14,7 @@ <valueless/> </properties> </leafNode> - #include <include/url.xml.i> + #include <include/url-http-https.xml.i> </children> </node> </children> |