From 64322b19d6968195a6dc7c82e7e22126072377f5 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 9 Nov 2023 15:06:33 -0600
Subject: 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.
---
 interface-definitions/include/url-http-https.xml.i | 15 +++++++++++++++
 interface-definitions/include/url.xml.i            | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 interface-definitions/include/url-http-https.xml.i
 delete mode 100644 interface-definitions/include/url.xml.i

(limited to 'interface-definitions/include')

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 -->
-- 
cgit v1.2.3