From a9e9c4acfa90fc15a8a4b6b5ea6e1c2814ce940e Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Wed, 21 Jul 2021 14:36:48 +0200
Subject: pki: openvpn: T3642: Migrate OpenVPN to PKI and refactor

---
 interface-definitions/interfaces-openvpn.xml.in | 73 ++++++++-----------------
 1 file changed, 22 insertions(+), 51 deletions(-)

(limited to 'interface-definitions/interfaces-openvpn.xml.in')

diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 681290570..7ff08ac86 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -637,16 +637,12 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="shared-secret-key-file">
+          <leafNode name="shared-secret-key">
             <properties>
-              <help>File containing the secret key shared with remote end of tunnel</help>
-              <valueHelp>
-                <format>filename</format>
-                <description>File in /config/auth directory</description>
-              </valueHelp>
-              <constraint>
-                <validator name="file-exists" argument="--directory /config/auth"/>
-              </constraint>
+              <help>Secret key shared with remote end of tunnel</help>
+              <completionHelp>
+                <path>pki openvpn shared-secret</path>
+              </completionHelp>
             </properties>
           </leafNode>
           <node name="tls">
@@ -654,55 +650,30 @@
               <help>Transport Layer Security (TLS) options</help>
             </properties>
             <children>
-              <leafNode name="auth-file">
-                <properties>
-                  <help>File containing tls static key for tls-auth</help>
-                  <valueHelp>
-                    <format>filename</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              #include <include/certificate.xml.i>
-              #include <include/certificate-ca.xml.i>
-              <leafNode name="crl-file">
+              <leafNode name="auth-key">
                 <properties>
-                  <help>File containing certificate revocation list (CRL) for this host</help>
-                  <valueHelp>
-                    <format>filename</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
-                  </constraint>
+                  <help>TLS shared secret key for tls-auth</help>
+                  <completionHelp>
+                    <path>pki openvpn shared-secret</path>
+                  </completionHelp>
                 </properties>
               </leafNode>
-              <leafNode name="dh-file">
+              #include <include/pki/certificate.xml.i>
+              #include <include/pki/ca-certificate.xml.i>
+              <leafNode name="dh-params">
                 <properties>
-                  <help>File containing Diffie Hellman parameters (server only)</help>
-                  <valueHelp>
-                    <format>filename</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
-                  </constraint>
+                  <help>Diffie Hellman parameters (server only)</help>
+                  <completionHelp>
+                    <path>pki dh</path>
+                  </completionHelp>
                 </properties>
               </leafNode>
-              #include <include/certificate-key.xml.i>
-              <leafNode name="crypt-file">
+              <leafNode name="crypt-key">
                 <properties>
-                  <help>File containing encryption key to authenticate control channel</help>
-                  <valueHelp>
-                    <format>filename</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
-                  </constraint>
+                  <help>Static key to use to authenticate control channel</help>
+                  <completionHelp>
+                    <path>pki openvpn shared-secret</path>
+                  </completionHelp>
                 </properties>
               </leafNode>
               <leafNode name="tls-version-min">
-- 
cgit v1.2.3