rattail/rattail-fabric2
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

More tweaks to logic for caching ssh host key

Browse source
This commit is contained in:
Lance Edgar 2020-10-09 16:38:19 -05:00
parent 8c08412d7b
commit f5a7f80fd4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rattail_fabric2/ssh.py
View file

@ -49,16 +49,16 @@ def cache_host_key(c, host, port=None, user=None, **kwargs):
# basic command failed, but in some cases that is simply b/c normal # basic command failed, but in some cases that is simply b/c normal
# commands are not allowed, although the ssh connection itself was # commands are not allowed, although the ssh connection itself was
# established okay. here we check for that situation. # established okay. here we check for that situation.
if result.stderr.strip() != "Disallowed command": if "Disallowed command" not in result.stderr:
# okay then we now think that the ssh connection itself was not # okay then we now think that the ssh connection itself was not
# made, which presumably means we *do* need to cache the host key, # made, which presumably means we *do* need to cache the host key,
# so try that now # so try that now
cmd = 'ssh -o StrictHostKeyChecking=no {} {} whoami'.format(port, host) cmd = 'ssh -o StrictHostKeyChecking=no {} {} whoami'.format(port, host)
if user: if user:
c.sudo(cmd, user=None if user == 'root' else user) c.sudo(cmd, user=None if user == 'root' else user, warn=True)
else: else:
c.run(cmd) c.run(cmd, warn=True)
def restart(c): def restart(c):