[stable-2.9] Handle InternalError raised by cryptography when running in FIPS mode (#65477)

Since older versions of paramiko do not require cryptography,
we cannot catch the exact exception from cryptography.

Remove other exceptions since we're catching everything now
(cherry picked from commit d35c1a435b)

Co-authored-by: Sam Doran <sdoran@redhat.com>
This commit is contained in:
Sam Doran
2019-12-09 13:18:32 -05:00
committed by Matt Clay
parent 003e9fdecd
commit e6db6d0d64
2 changed files with 6 additions and 1 deletions

View File

@ -0,0 +1,2 @@
bugfixes:
- paramiko - catch and handle exception to prevent stack trace when running in FIPS mode

View File

@ -10,5 +10,8 @@ PARAMIKO_IMPORT_ERR = None
paramiko = None
try:
import paramiko
except (ImportError, AttributeError) as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError
# paramiko and gssapi are incompatible and raise AttributeError not ImportError
# When running in FIPS mode, cryptography raises InternalError
# https://bugzilla.redhat.com/show_bug.cgi?id=1778939
except Exception as err:
PARAMIKO_IMPORT_ERR = err