sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

host and ssh: Fix sudo invocation

Browse Source 
Add -k to sudo invocation to avoid using cached credentials.

If cached credentials is used, sudo will not write a prompt again,
leading to the stderr fixup code to remove a char from stderr output.
This commit is contained in:
douglas-raillard-arm 2021-03-24 10:09:45 +00:00 committed by Marc Bonnici
parent d953377ff3
commit 5d342044a2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devlib/host.py
View File

@ -102,7 +102,7 @@ class LocalConnection(ConnectionBase):
if self.unrooted: if self.unrooted:
raise TargetStableError('unrooted') raise TargetStableError('unrooted')
password = self._get_password() password = self._get_password()
command = "echo {} | sudo -p ' ' -S -- sh -c {}".format(quote(password), quote(command)) command = "echo {} | sudo -k -p ' ' -S -- sh -c {}".format(quote(password), quote(command))
ignore = None if check_exit_code else 'all' ignore = None if check_exit_code else 'all'
try: try:
stdout, stderr = check_output(command, shell=True, timeout=timeout, ignore=ignore) stdout, stderr = check_output(command, shell=True, timeout=timeout, ignore=ignore)
@ -127,7 +127,7 @@ class LocalConnection(ConnectionBase):
password = self._get_password() password = self._get_password()
# The sudo prompt will add a space on stderr, but we cannot filter # The sudo prompt will add a space on stderr, but we cannot filter
# it out here # it out here
command = "echo {} | sudo -p ' ' -S -- sh -c {}".format(quote(password), quote(command)) command = "echo {} | sudo -k -p ' ' -S -- sh -c {}".format(quote(password), quote(command))
# Make sure to get a new PGID so PopenBackgroundCommand() can kill # Make sure to get a new PGID so PopenBackgroundCommand() can kill
# all sub processes that could be started without troubles. # all sub processes that could be started without troubles.

2
devlib/utils/ssh.py
View File

@ -59,7 +59,7 @@ from devlib.connection import (ConnectionBase, ParamikoBackgroundCommand, PopenB
SSHTransferManager) SSHTransferManager)
DEFAULT_SSH_SUDO_COMMAND = "sudo -p ' ' -S -- sh -c {}" DEFAULT_SSH_SUDO_COMMAND = "sudo -k -p ' ' -S -- sh -c {}"
ssh = None ssh = None