From a2db767cccca2c78c1dcc869157018e8d923ec08 Mon Sep 17 00:00:00 2001
From: erkin <e.altunbas@vyos.io>
Date: Sun, 20 Jun 2021 12:54:12 +0300
Subject: T3506: loadkey: Add `generate public-key-command` command

---
 .../generate-public-key-command.xml.in             | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 op-mode-definitions/generate-public-key-command.xml.in

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/generate-public-key-command.xml.in b/op-mode-definitions/generate-public-key-command.xml.in
new file mode 100644
index 000000000..b50b432b8
--- /dev/null
+++ b/op-mode-definitions/generate-public-key-command.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="generate">
+    <children>
+      <node name="public-key-command">
+        <properties>
+          <help>Generate configuration mode command to add OpenSSH public key from file</help>
+        </properties>
+        <children>
+          <tagNode name="user">
+            <properties>
+	      <help>Username of public key owner</help>
+              <completionHelp>
+                <list>&lt;username&gt;</list>
+              </completionHelp>
+            </properties>
+            <children>
+              <tagNode name="path">
+                <properties>
+		  <help>Local path or remote URL of OpenSSH public key</help>
+                  <completionHelp>
+                    <list>&lt;http[s]://[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;ftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;tftp://&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;sftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;scp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;[file://]/&lt;path-to-file&gt;&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/generate_public_key_command.py "$4" "$6"</command>
+              </tagNode>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3


From 79ce4caf051ce30914ee3d08f1bd23753bf06af1 Mon Sep 17 00:00:00 2001
From: erkin <e.altunbas@vyos.io>
Date: Sun, 20 Jun 2021 15:08:25 +0300
Subject: Use `CDATA` to quote URL templates

---
 op-mode-definitions/generate-public-key-command.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/generate-public-key-command.xml.in b/op-mode-definitions/generate-public-key-command.xml.in
index b50b432b8..21f0f56f0 100644
--- a/op-mode-definitions/generate-public-key-command.xml.in
+++ b/op-mode-definitions/generate-public-key-command.xml.in
@@ -9,7 +9,7 @@
         <children>
           <tagNode name="user">
             <properties>
-	      <help>Username of public key owner</help>
+              <help>Username of public key owner</help>
               <completionHelp>
                 <list>&lt;username&gt;</list>
               </completionHelp>
@@ -17,9 +17,9 @@
             <children>
               <tagNode name="path">
                 <properties>
-		  <help>Local path or remote URL of OpenSSH public key</help>
+                  <help>Local path or remote URL of OpenSSH public key</help>
                   <completionHelp>
-                    <list>&lt;http[s]://[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;ftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;tftp://&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;sftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;scp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;[file://]/&lt;path-to-file&gt;&gt;</list>
+                    <list><![CDATA[<http[s]://[<username>:<password>@]<hostname>/<path-to-file>> <ftp://[<username>[:<password>]@]<hostname>/<path-to-file>> <tftp://<hostname>/<path-to-file>> <sftp://[<username>[:<password>]@]<hostname>/<path-to-file>> <scp://[<username>[:<password>]@]<hostname>/<path-to-file>> <[file://]/<path-to-file>>]]></list>
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/generate_public_key_command.py "$4" "$6"</command>
-- 
cgit v1.2.3


From 35d98c78455fe484cea18fb0c3c537059a798e17 Mon Sep 17 00:00:00 2001
From: erkin <e.altunbas@vyos.io>
Date: Sun, 20 Jun 2021 15:43:26 +0300
Subject: Revert to the character entity reference version

---
 op-mode-definitions/generate-public-key-command.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/generate-public-key-command.xml.in b/op-mode-definitions/generate-public-key-command.xml.in
index 21f0f56f0..5815e5cf9 100644
--- a/op-mode-definitions/generate-public-key-command.xml.in
+++ b/op-mode-definitions/generate-public-key-command.xml.in
@@ -19,7 +19,7 @@
                 <properties>
                   <help>Local path or remote URL of OpenSSH public key</help>
                   <completionHelp>
-                    <list><![CDATA[<http[s]://[<username>:<password>@]<hostname>/<path-to-file>> <ftp://[<username>[:<password>]@]<hostname>/<path-to-file>> <tftp://<hostname>/<path-to-file>> <sftp://[<username>[:<password>]@]<hostname>/<path-to-file>> <scp://[<username>[:<password>]@]<hostname>/<path-to-file>> <[file://]/<path-to-file>>]]></list>
+                    <list>&lt;http[s]://[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;ftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;tftp://&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;sftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;scp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;[file://]/&lt;path-to-file&gt;&gt;</list>
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/generate_public_key_command.py "$4" "$6"</command>
-- 
cgit v1.2.3


From a80510875d1b44c83ac6104629460019db57aca9 Mon Sep 17 00:00:00 2001
From: erkin <e.altunbas@vyos.io>
Date: Sun, 20 Jun 2021 15:55:58 +0300
Subject: Escape the slash character to dodge GCC preprocessor

---
 op-mode-definitions/generate-public-key-command.xml.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/generate-public-key-command.xml.in b/op-mode-definitions/generate-public-key-command.xml.in
index 5815e5cf9..7920acffd 100644
--- a/op-mode-definitions/generate-public-key-command.xml.in
+++ b/op-mode-definitions/generate-public-key-command.xml.in
@@ -19,7 +19,8 @@
                 <properties>
                   <help>Local path or remote URL of OpenSSH public key</help>
                   <completionHelp>
-                    <list>&lt;http[s]://[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;ftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;tftp://&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;sftp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;scp://[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;/&lt;path-to-file&gt;&gt; &lt;[file://]/&lt;path-to-file&gt;&gt;</list>
+		    <!-- TODO: Replace this mess with verbatim, readable text. Till then, may gods have mercy. -->
+                    <list>&lt;http[s]:&#47;&#47;[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;ftp:&#47;&#47;[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;tftp:&#47;&#47;&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;sftp:&#47;&#47;[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;scp:&#47;&#47;[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;[file:&#47;&#47;]&#47;&lt;path-to-file&gt;&gt;</list>
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/generate_public_key_command.py "$4" "$6"</command>
-- 
cgit v1.2.3


From 04a088bb2f96b6f5b00ff0acb4218850384d5a25 Mon Sep 17 00:00:00 2001
From: erkin <e.altunbas@vyos.io>
Date: Sun, 20 Jun 2021 17:02:30 +0300
Subject: Use `CDATA` to quote URL templates (redux)

---
 op-mode-definitions/generate-public-key-command.xml.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/generate-public-key-command.xml.in b/op-mode-definitions/generate-public-key-command.xml.in
index 7920acffd..21f0f56f0 100644
--- a/op-mode-definitions/generate-public-key-command.xml.in
+++ b/op-mode-definitions/generate-public-key-command.xml.in
@@ -19,8 +19,7 @@
                 <properties>
                   <help>Local path or remote URL of OpenSSH public key</help>
                   <completionHelp>
-		    <!-- TODO: Replace this mess with verbatim, readable text. Till then, may gods have mercy. -->
-                    <list>&lt;http[s]:&#47;&#47;[&lt;username&gt;:&lt;password&gt;@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;ftp:&#47;&#47;[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;tftp:&#47;&#47;&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;sftp:&#47;&#47;[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;scp:&#47;&#47;[&lt;username&gt;[:&lt;password&gt;]@]&lt;hostname&gt;&#47;&lt;path-to-file&gt;&gt; &lt;[file:&#47;&#47;]&#47;&lt;path-to-file&gt;&gt;</list>
+                    <list><![CDATA[<http[s]://[<username>:<password>@]<hostname>/<path-to-file>> <ftp://[<username>[:<password>]@]<hostname>/<path-to-file>> <tftp://<hostname>/<path-to-file>> <sftp://[<username>[:<password>]@]<hostname>/<path-to-file>> <scp://[<username>[:<password>]@]<hostname>/<path-to-file>> <[file://]/<path-to-file>>]]></list>
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/generate_public_key_command.py "$4" "$6"</command>
-- 
cgit v1.2.3