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

TelnetConnection: allow client to specify the original prompt string

Browse Source
This commit is contained in:
Gareth Stockwell 2016-07-29 15:47:50 +01:00
parent baab8ab131
commit 76b059c6b1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devlib/utils/ssh.py
View File

@ -43,14 +43,14 @@ sshpass = None
logger = logging.getLogger('ssh') logger = logging.getLogger('ssh')
def ssh_get_shell(host, username, password=None, keyfile=None, port=None, timeout=10, telnet=False): def ssh_get_shell(host, username, password=None, keyfile=None, port=None, timeout=10, telnet=False, original_prompt=None):
_check_env() _check_env()
start_time = time.time() start_time = time.time()
while True: while True:
if telnet: if telnet:
if keyfile: if keyfile:
raise ValueError('keyfile may not be used with a telnet connection.') raise ValueError('keyfile may not be used with a telnet connection.')
conn = TelnetConnection() conn = TelnetConnection(original_prompt=original_prompt)
else: # ssh else: # ssh
conn = pxssh.pxssh() conn = pxssh.pxssh()
@ -77,7 +77,11 @@ def ssh_get_shell(host, username, password=None, keyfile=None, port=None, timeou
class TelnetConnection(pxssh.pxssh): class TelnetConnection(pxssh.pxssh):
# pylint: disable=arguments-differ # pylint: disable=arguments-differ
def login(self, server, username, password='', original_prompt=r'[#$]', login_timeout=10, def __init__(self, original_prompt):
super(TelnetConnection, self).__init__()
self.original_prompt = original_prompt or r'[#$]'
def login(self, server, username, password='', login_timeout=10,
auto_prompt_reset=True, sync_multiplier=1, port=23): auto_prompt_reset=True, sync_multiplier=1, port=23):
cmd = 'telnet -l {} {} {}'.format(username, server, port) cmd = 'telnet -l {} {} {}'.format(username, server, port)
@ -85,7 +89,7 @@ class TelnetConnection(pxssh.pxssh):
i = self.expect('(?i)(?:password)', timeout=login_timeout) i = self.expect('(?i)(?:password)', timeout=login_timeout)
if i == 0: if i == 0:
self.sendline(password) self.sendline(password)
i = self.expect([original_prompt, 'Login incorrect'], timeout=login_timeout) i = self.expect([self.original_prompt, 'Login incorrect'], timeout=login_timeout)
else: else:
raise pxssh.ExceptionPxssh('could not log in: did not see a password prompt') raise pxssh.ExceptionPxssh('could not log in: did not see a password prompt')
@ -142,6 +146,7 @@ class SshConnection(object):
timeout=None, timeout=None,
telnet=False, telnet=False,
password_prompt=None, password_prompt=None,
original_prompt=None,
): ):
self.host = host self.host = host
self.username = username self.username = username
@ -152,7 +157,7 @@ class SshConnection(object):
self.password_prompt = password_prompt if password_prompt is not None else self.default_password_prompt self.password_prompt = password_prompt if password_prompt is not None else self.default_password_prompt
logger.debug('Logging in {}@{}'.format(username, host)) logger.debug('Logging in {}@{}'.format(username, host))
timeout = timeout if timeout is not None else self.default_timeout timeout = timeout if timeout is not None else self.default_timeout
self.conn = ssh_get_shell(host, username, password, self.keyfile, port, timeout, telnet) self.conn = ssh_get_shell(host, username, password, self.keyfile, port, timeout, telnet, original_prompt)
def push(self, source, dest, timeout=30): def push(self, source, dest, timeout=30):
dest = '{}@{}:{}'.format(self.username, self.host, dest) dest = '{}@{}:{}'.format(self.username, self.host, dest)