Executing command with sudo no longer exposes the user password to th…

…e root. (#393) Closes #350
MarketSquare · Nov 5, 2021 · f9a5ff7 · f9a5ff7
1 parent 3d66b36
commit f9a5ff7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/SSHLibrary/javaclient.py b/src/SSHLibrary/javaclient.py
@@ -266,11 +266,12 @@ def _execute(self):
         self._shell.execCommand(command)
 
     def _execute_with_sudo(self, sudo_password=None):
-        command = 'sudo ' + self._command.decode(self._encoding)
+        command = self._command.decode(self._encoding)
         if sudo_password is None:
-            self._shell.execCommand(command)
+            self._shell.execCommand('sudo ' + command)
         else:
-            self._shell.execCommand('echo %s | sudo --stdin --prompt "" %s' % (sudo_password, command))
+            self._shell.execCommand('sudo --stdin --prompt "" %s' % (command))
+            self._shell.write('\n\n' + sudo_password + '\n')
 
     def _invoke(self):
         command = self._command.decode(self._encoding)

diff --git a/src/SSHLibrary/pythonclient.py b/src/SSHLibrary/pythonclient.py
@@ -491,11 +491,12 @@ def _execute(self):
         self._shell.exec_command(self._command)
 
     def _execute_with_sudo(self, sudo_password=None):
-        command = 'sudo ' + self._command.decode(self._encoding)
+        command = self._command.decode(self._encoding)
         if sudo_password is None:
-            self._shell.exec_command(command)
+            self._shell.exec_command('sudo ' + command)
         else:
-            self._shell.exec_command('echo %s | sudo --stdin --prompt "" %s' % (sudo_password, command))
+            self._shell.exec_command('sudo --stdin --prompt "" %s' % (command))
+            self._shell.sendall('\n\n' + sudo_password + '\n')
 
     def _invoke(self):
         self._shell.invoke_subsystem(self._command)