mirror of
https://github.com/clearml/clearml-session
synced 2025-02-07 13:22:17 +00:00
Merge pull request #26 from mukhery/bugfix-key-login
bugfix: handle ssh key login
This commit is contained in:
commit
44827aec0a
@ -696,7 +696,7 @@ def wait_for_machine(state, task):
|
|||||||
def start_ssh_tunnel(username, remote_address, ssh_port, ssh_password, local_remote_pair_list, debug=False):
|
def start_ssh_tunnel(username, remote_address, ssh_port, ssh_password, local_remote_pair_list, debug=False):
|
||||||
print('Starting SSH tunnel to {}@{}, port {}'.format(username, remote_address, ssh_port))
|
print('Starting SSH tunnel to {}@{}, port {}'.format(username, remote_address, ssh_port))
|
||||||
child = None
|
child = None
|
||||||
args = ['-N', '-C',
|
args = ['-C',
|
||||||
'{}@{}'.format(username, remote_address), '-p', '{}'.format(ssh_port),
|
'{}@{}'.format(username, remote_address), '-p', '{}'.format(ssh_port),
|
||||||
'-o', 'UserKnownHostsFile=/dev/null',
|
'-o', 'UserKnownHostsFile=/dev/null',
|
||||||
'-o', 'Compression=yes',
|
'-o', 'Compression=yes',
|
||||||
@ -717,7 +717,8 @@ def start_ssh_tunnel(username, remote_address, ssh_port, ssh_password, local_rem
|
|||||||
args=args,
|
args=args,
|
||||||
logfile=fd, timeout=20, encoding='utf-8')
|
logfile=fd, timeout=20, encoding='utf-8')
|
||||||
|
|
||||||
i = child.expect([r'(?i)password:', r'\(yes\/no\)', r'.*[$#] ', pexpect.EOF])
|
# Match only "(yes/no" in order to handle both (yes/no) and (yes/no/[fingerprint])
|
||||||
|
i = child.expect([r'(?i)password:', r'\(yes\/no', r'.*[$#] ', pexpect.EOF])
|
||||||
if i == 0:
|
if i == 0:
|
||||||
child.sendline(ssh_password)
|
child.sendline(ssh_password)
|
||||||
try:
|
try:
|
||||||
|
Loading…
Reference in New Issue
Block a user