From 73b234d29e240ba181b58301387ab3e9b7a0c2b8 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 8 Feb 2019 14:42:53 -0500 Subject: [PATCH] Support pre-cryptography paramiko Older paraiko may be in use that does not have cryptography requirement, address error by only conditionally checking cryptography. --- confluent_server/confluent/plugins/shell/ssh.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/plugins/shell/ssh.py b/confluent_server/confluent/plugins/shell/ssh.py index 7cb83fdb..efd0c71a 100644 --- a/confluent_server/confluent/plugins/shell/ssh.py +++ b/confluent_server/confluent/plugins/shell/ssh.py @@ -22,7 +22,11 @@ import confluent.exceptions as cexc import confluent.interface.console as conapi import confluent.log as log -import cryptography +try: + import cryptography +except ImportError: + # Using older, non-crypography based paramiko + cryptography = None import eventlet import hashlib @@ -30,7 +34,7 @@ import sys sys.modules['gssapi'] = None paramiko = eventlet.import_patched('paramiko') warnhostkey = False -if cryptography.__version__.split('.') < ['1', '5']: +if cryptography and cryptography.__version__.split('.') < ['1', '5']: # older cryptography with paramiko breaks most key support except # ed25519 warnhostkey = True