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

SshConnection: Implement tracking of connected_as_root status

Browse Source 
Improve the detection of being `connected_as_root` from comparing the
username to checking the actual id of the user and export this as a
property for the connection.
This commit is contained in:
Marc Bonnici 2019-08-27 14:40:17 +01:00
parent 66de30799b
commit 18830b74da
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devlib/utils/ssh.py
View File

@ -158,6 +158,18 @@ class SshConnection(object):
def name(self): def name(self):
return self.host return self.host
@property
def connected_as_root(self):
if self._connected_as_root is None:
# Execute directly to prevent deadlocking of connection
result = self._execute_and_wait_for_prompt('id', as_root=False)
self._connected_as_root = 'uid=0(' in result
return self._connected_as_root
@connected_as_root.setter
def connected_as_root(self, state):
self._connected_as_root = state
# pylint: disable=unused-argument,super-init-not-called # pylint: disable=unused-argument,super-init-not-called
def __init__(self, def __init__(self,
host, host,
@ -172,6 +184,7 @@ class SshConnection(object):
platform=None, platform=None,
sudo_cmd="sudo -- sh -c {}" sudo_cmd="sudo -- sh -c {}"
): ):
self._connected_as_root = None
self.host = host self.host = host
self.username = username self.username = username
self.password = password self.password = password
@ -232,7 +245,7 @@ class SshConnection(object):
try: try:
port_string = '-p {}'.format(self.port) if self.port else '' port_string = '-p {}'.format(self.port) if self.port else ''
keyfile_string = '-i {}'.format(self.keyfile) if self.keyfile else '' keyfile_string = '-i {}'.format(self.keyfile) if self.keyfile else ''
if as_root: if as_root and not self.connected_as_root:
command = self.sudo_cmd.format(command) command = self.sudo_cmd.format(command)
command = '{} {} {} {}@{} {}'.format(ssh, keyfile_string, port_string, self.username, self.host, command) command = '{} {} {} {}@{} {}'.format(ssh, keyfile_string, port_string, self.username, self.host, command)
logger.debug(command) logger.debug(command)
@ -261,7 +274,7 @@ class SshConnection(object):
def _execute_and_wait_for_prompt(self, command, timeout=None, as_root=False, strip_colors=True, log=True): def _execute_and_wait_for_prompt(self, command, timeout=None, as_root=False, strip_colors=True, log=True):
self.conn.prompt(0.1) # clear an existing prompt if there is one. self.conn.prompt(0.1) # clear an existing prompt if there is one.
if self.username == 'root': if as_root and self.connected_as_root:
# As we're already root, there is no need to use sudo. # As we're already root, there is no need to use sudo.
as_root = False as_root = False
if as_root: if as_root: