From 1017c8103f12ebd6db4f250d8a154571fff32db1 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Mon, 9 Sep 2019 11:55:54 -0700
Subject: [wireguard]: T1572 - Wireguard keyPair per interface

  - param key location added in op-mode script
  - param delkey and listkey implemented in op-mode script
  - param delkey implemented in op-mode script
  - generate and store named keys
  - interface implementation tu use cli option
    'private-key'
---
 op-mode-definitions/wireguard.xml | 53 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/wireguard.xml b/op-mode-definitions/wireguard.xml
index fa5e4a206..785af202c 100644
--- a/op-mode-definitions/wireguard.xml
+++ b/op-mode-definitions/wireguard.xml
@@ -20,6 +20,12 @@
             </properties>
             <command>${vyos_op_scripts_dir}/wireguard.py --genpsk</command>
           </leafNode>
+          <tagNode name="named-keypairs">
+            <properties>
+              <help>Generates named wireguard keypairs</help>
+            </properties>
+            <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey --location "$4"</command>
+          </tagNode>
         </children>
       </node>
     </children>
@@ -33,7 +39,7 @@
         <children>
           <leafNode name="pubkey">
             <properties>
-              <help>show wireguard public key</help>
+              <help>Show wireguard public key</help>
             </properties>
             <command>${vyos_op_scripts_dir}/wireguard.py --showpub</command>
           </leafNode>
@@ -43,6 +49,31 @@
             </properties>
             <command>${vyos_op_scripts_dir}/wireguard.py --showpriv</command>
           </leafNode>
+          <node name="named-keypairs">
+            <properties>
+              <help>Shows named wireguard keys</help>
+            </properties>
+            <children>
+              <tagNode name="pubkey">
+                <properties>
+                  <help>Show wireguard private named key</help>
+                  <completionHelp>
+                    <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/wireguard.py --showpub --location "$5"</command>
+              </tagNode>
+              <tagNode name="privkey">
+                <properties>
+                  <help>Show wireguard public named key</help>
+                  <completionHelp>
+                    <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/wireguard.py --showpriv --location "$5"</command>
+              </tagNode>
+            </children>
+          </node>
         </children>
       </node>
       <node name="interfaces">
@@ -81,5 +112,25 @@
       </node>
     </children>
   </node>
+  <node name="delete">
+    <children>
+      <node name="wireguard">
+        <properties>
+          <help>Delete wireguard properties</help>
+        </properties>
+        <children>
+          <tagNode name="named-keypair">
+            <properties>
+              <help>Delete wireguard named keypair</help>
+              <completionHelp>
+                <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
+              </completionHelp>
+            </properties>
+            <command>sudo ${vyos_op_scripts_dir}/wireguard.py --delkdir --location "$4"</command>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
 </interfaceDefinition>
 
-- 
cgit v1.2.3