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.
vyos · Nov 9, 2023 · 64322b1 · 64322b1
1 parent 1f4e9bc
commit 64322b1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -14,7 +14,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/url.xml.i>
+          #include <include/url-http-https.xml.i>
         </children>
       </node>
     </children>