From a6831b208ca431c323904949285f0205f342d4fb Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Sat, 1 Sep 2018 09:16:25 -0700
Subject: T427,T793 wireguard support

  - regex added to check endpoint as pattern IP:port
  - T793: preparation for the use preshared key
---
 interface-definitions/wireguard.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'interface-definitions/wireguard.xml')

diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index cf25124fa..e325c5df9 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -87,6 +87,15 @@
                   </constraint>
                   <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
                 </properties>
+              </leafNode>
+                <leafNode name="preshared-key">
+                <properties>
+                  <help>base64 encoded preshared key</help>
+                  <constraint>
+                    <regex>^[0-9a-zA-Z\+/]{43}=$</regex>
+                  </constraint>
+                  <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
+                </properties>
               </leafNode>
               <leafNode name="allowed-ips">
                 <properties>
@@ -98,6 +107,10 @@
               <leafNode name="endpoint">
                 <properties>
                   <help>Remote endpoint</help>
+                  <constraint>
+                    <regex>:[1-6][0-9]{3,4}$</regex>
+                  </constraint>
+                  <constraintErrorMessage>invalid endpoint setting (IP:port)</constraintErrorMessage>
                 </properties>
               </leafNode>
               <leafNode name="persistent-keepalive">
-- 
cgit v1.2.3


From 737afd170b0b2dfbb86514e0fcf4959794064632 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Sun, 2 Sep 2018 08:46:12 -0700
Subject: regex for endpoint removed

---
 interface-definitions/wireguard.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'interface-definitions/wireguard.xml')

diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index e325c5df9..5e9c41ace 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -103,14 +103,10 @@
                 <multi/>
                 </properties>
               </leafNode>
-              <!--  check format IP:port -->
+              <!--  eventually check format IP:port -->
               <leafNode name="endpoint">
                 <properties>
-                  <help>Remote endpoint</help>
-                  <constraint>
-                    <regex>:[1-6][0-9]{3,4}$</regex>
-                  </constraint>
-                  <constraintErrorMessage>invalid endpoint setting (IP:port)</constraintErrorMessage>
+                  <help>Remote endpoint (IP:port)</help>
                 </properties>
               </leafNode>
               <leafNode name="persistent-keepalive">
-- 
cgit v1.2.3