From 432e5048db19ddf5a7505866421f77bb01635d08 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 18 May 2021 19:13:34 +0200
Subject: revert: "util: T2467: add autosudo as an option to command"

Implementing a wrapper which will - based on the command - add a sudo prefix
to the execution string seemed to be a nice idea but unfortunately it did not
only not get momentum but also the codebase somethis added an implicit "sudo"
call a second time.

This resulted in a call: "sudo sudo systemctl"

The entire functionality was removed again and if an op-mode script requires
root priviledges it must be explicitly called with them - no black magic.

(cherry picked from commit b76931e6d3a4bd0cdb74ca447a746ab6855fcf55)
---
 op-mode-definitions/flow-accounting-op.xml.in      |  2 +-
 op-mode-definitions/generate-ssh-server-key.xml.in | 24 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/flow-accounting-op.xml.in b/op-mode-definitions/flow-accounting-op.xml.in
index b847338f9..7aaae5974 100644
--- a/op-mode-definitions/flow-accounting-op.xml.in
+++ b/op-mode-definitions/flow-accounting-op.xml.in
@@ -57,7 +57,7 @@
         <properties>
           <help>Restart (net)flow accounting process</help>
         </properties>
-        <command>${vyos_op_scripts_dir}/flow_accounting_op.py --action restart</command>
+        <command>sudo ${vyos_op_scripts_dir}/flow_accounting_op.py --action restart</command>
       </leafNode>
     </children>
   </node>
diff --git a/op-mode-definitions/generate-ssh-server-key.xml.in b/op-mode-definitions/generate-ssh-server-key.xml.in
index a6ebf1b78..ecea3e5d1 100644
--- a/op-mode-definitions/generate-ssh-server-key.xml.in
+++ b/op-mode-definitions/generate-ssh-server-key.xml.in
@@ -2,14 +2,30 @@
 <interfaceDefinition>
   <node name="generate">
     <properties>
-      <help>Generate an object</help>
+      <help>Generate an object/key</help>
     </properties>
     <children>
-      <node name="ssh-server-key">
+      <node name="ssh">
         <properties>
-          <help>Regenerate the host SSH keys and restart the SSH server</help>
+          <help>Generate SSH related keypairs</help>
         </properties>
-        <command>${vyos_op_scripts_dir}/generate_ssh_server_key.py</command>
+        <children>
+          <node name="server-key">
+            <properties>
+              <help>Re-generate SSH host keys and restart SSH server</help>
+            </properties>
+            <command>sudo ${vyos_op_scripts_dir}/generate_ssh_server_key.py</command>
+          </node>
+          <tagNode name="client-key">
+            <properties>
+              <help>Re-generate SSH client keypair</help>
+              <completionHelp>
+                <list>&lt;filename&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>ssh-keygen -t rsa -f "$4" -N ""</command>
+          </tagNode>
+        </children>
       </node>
     </children>
   </node>
-- 
cgit v1.2.3