Revert "External sshpass command now supports complex passwords"

WithSecureLabs · Jul 26, 2018 · c4db8aa · c4db8aa
1 parent f48f8a3
commit c4db8aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/needle/core/device/device.py b/needle/core/device/device.py
@@ -244,7 +244,7 @@ def cleanup(self):
 
     def shell(self):
         """Spawn a system shell on the device."""
-        cmd = 'sshpass -p \'{password}\' ssh {hostverification} -p {port} {username}@{ip}'.format(password=self._password,
+        cmd = 'sshpass -p "{password}" ssh {hostverification} -p {port} {username}@{ip}'.format(password=self._password,
                                                                                                 hostverification=Constants.DISABLE_HOST_VERIFICATION,
                                                                                                 port=self._port,
                                                                                                 username=self._username,
@@ -259,4 +259,4 @@ def pull(self, src, dst):
     def push(self, src, dst):
         """Push a file on the device."""
         self.printer.info("Pushing: %s -> %s" % (src, dst))
-        self.remote_op.upload(src, dst)
+        self.remote_op.upload(src, dst)
diff --git a/needle/core/device/remote_operations.py b/needle/core/device/remote_operations.py
@@ -98,7 +98,7 @@ def command_blocking(self, cmd, internal=True):
     def command_interactive(self, cmd):
         """Run a command which requires an interactive shell."""
         self._device.printer.debug("[REMOTE CMD] Remote Interactive Command: %s" % cmd)
-        cmd = 'sshpass -p \'{password}\' ssh {hostverification} -p {port} -t {username}@{ip} "{cmd}"'.format(password=self._device._password,
+        cmd = 'sshpass -p "{password}" ssh {hostverification} -p {port} -t {username}@{ip} "{cmd}"'.format(password=self._device._password,
                                                                                                            hostverification=Constants.DISABLE_HOST_VERIFICATION,
                                                                                                            port=self._device._port,
                                                                                                            username=self._device._username,
@@ -111,7 +111,7 @@ def command_interactive(self, cmd):
     def command_interactive_tty(self, cmd):
         """Run a command in a full TTY shell."""
         self._device.printer.debug("[REMOTE CMD] Remote Interactive TTY Command: %s" % cmd)
-        cmd = 'sshpass -p \'{password}\' ssh {hostverification} -p {port} -t {username}@{ip} "{cmd}"'.format(password=self._device._password,
+        cmd = 'sshpass -p "{password}" ssh {hostverification} -p {port} -t {username}@{ip} "{cmd}"'.format(password=self._device._password,
                                                                                                            hostverification=Constants.DISABLE_HOST_VERIFICATION,
                                                                                                            port=self._device._port,
                                                                                                            username=self._device._username,
@@ -164,7 +164,7 @@ def download(self, src, dst, recursive=False):
         src, dst = Utils.escape_path_scp(src), Utils.escape_path(dst)
         self._device.printer.debug("Downloading: %s -> %s" % (src, dst))
 
-        cmd = 'sshpass -p \'{password}\' scp {hostverification} -P {port}'.format(password=self._device._password,
+        cmd = 'sshpass -p "{password}" scp {hostverification} -P {port}'.format(password=self._device._password,
                                                                                 hostverification=Constants.DISABLE_HOST_VERIFICATION,
                                                                                 port=self._device._port)
         if recursive: cmd += ' -r'
@@ -179,7 +179,7 @@ def upload(self, src, dst, recursive=True):
         src, dst = Utils.escape_path_scp(src), Utils.escape_path_scp(dst)
         self._device.printer.debug("Uploading: %s -> %s" % (src, dst))
 
-        cmd = 'sshpass -p \'{password}\' scp {hostverification} -P {port}'.format(password=self._device._password,
+        cmd = 'sshpass -p "{password}" scp {hostverification} -P {port}'.format(password=self._device._password,
                                                                                 hostverification=Constants.DISABLE_HOST_VERIFICATION,
                                                                                 port=self._device._port)
         if recursive: cmd += ' -r'