wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openssl_certificate_info, openssl_csr: fix wrong exception, and little refactoring (#54922)

Browse source 
* Fix wrong exception name.

* Use crypto_utils.load_certificate_request() to load CSRs with both backends.
This commit is contained in:
Felix Fontein 2019-04-05 22:18:30 +02:00 committed by ansibot
parent dafdcf286a
commit c5991b970f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/crypto/openssl_certificate_info.py
View file

@ -282,7 +282,7 @@ def get_relative_time_option(input_string, input_name):
if result.startswith("+") or result.startswith("-"):
return crypto_utils.convert_relative_to_datetime(result)
if result is None:
raise crypto_utils.CertificateError(
raise crypto_utils.OpenSSLObjectError(
'The timespec "%s" for %s is not valid' %
input_string, input_name)
for date_fmt in ['%Y%m%d%H%M%SZ', '%Y%m%d%H%MZ', '%Y%m%d%H%M%S%z', '%Y%m%d%H%M%z']:
@ -293,7 +293,7 @@ def get_relative_time_option(input_string, input_name):
pass
if not isinstance(result, datetime.datetime):
raise crypto_utils.CertificateError(
raise crypto_utils.OpenSSLObjectError(
'The time spec "%s" for %s is invalid' %
(input_string, input_name)
)

5
lib/ansible/modules/crypto/openssl_csr.py
View file

@ -632,7 +632,7 @@ class CertificateSigningRequestPyOpenSSL(CertificateSigningRequestBase):
return False
try:
csr = crypto_utils.load_certificate_request(self.path)
csr = crypto_utils.load_certificate_request(self.path, backend='pyopenssl')
except Exception as dummy:
return False
@ -819,8 +819,7 @@ class CertificateSigningRequestCryptography(CertificateSigningRequestBase):
return key_a == key_b
try:
with open(self.path, 'rb') as f:
csr = cryptography.x509.load_pem_x509_csr(f.read(), self.cryptography_backend)
csr = crypto_utils.load_certificate_request(self.path, backend='cryptography')
except Exception as dummy:
return False