From 63052b8906871dc314945922e7f27ef24e114a45 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 15 Jul 2020 20:56:53 +0200
Subject: http-client: T2651: support specifying source-interface/address for
 curl

Please note that either interface or address can be configured.

system {
    options {
        http-client {
            source-interface eth0
            source-address 1.1.1.1
        }
    }
}
---
 .../include/source-address-ipv4-ipv6.xml.i              | 17 +++++++++++++++++
 interface-definitions/system-options.xml.in             | 11 ++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 interface-definitions/include/source-address-ipv4-ipv6.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
new file mode 100644
index 000000000..6d2d77c95
--- /dev/null
+++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
@@ -0,0 +1,17 @@
+<leafNode name="source-address">
+  <properties>
+    <help>IPv4/IPv6 source address</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 source-address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 source-address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-options.xml.in
index 48bc353ab..194773329 100644
--- a/interface-definitions/system-options.xml.in
+++ b/interface-definitions/system-options.xml.in
@@ -33,7 +33,7 @@
                 <description>Poweroff VyOS</description>
               </valueHelp>
               <constraint>
-                <regex>(ignore|reboot|poweroff)</regex>
+                <regex>^(ignore|reboot|poweroff)$</regex>
               </constraint>
               <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage>
             </properties>
@@ -44,6 +44,15 @@
                <valueless/>
              </properties>
            </leafNode>
+           <node name="http-client">
+             <properties>
+               <help>Global options used for HTTP based commands</help>
+             </properties>
+             <children>
+               #include <include/source-interface.xml.i>
+               #include <include/source-address-ipv4-ipv6.xml.i>
+             </children>
+           </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3