From 12f958c95514de32b9f10690b142e89b207041ac Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 3 May 2025 12:55:50 +0200 Subject: [PATCH] Fix assert_required_cryptography_version() calls. --- plugins/module_utils/crypto/module_backends/certificate.py | 4 +++- .../module_utils/crypto/module_backends/certificate_info.py | 4 +++- plugins/module_utils/crypto/module_backends/crl_info.py | 4 +++- plugins/module_utils/crypto/module_backends/csr.py | 4 +++- plugins/module_utils/crypto/module_backends/csr_info.py | 4 +++- plugins/module_utils/crypto/module_backends/privatekey.py | 4 +++- .../module_utils/crypto/module_backends/privatekey_convert.py | 4 +++- .../module_utils/crypto/module_backends/privatekey_info.py | 4 +++- plugins/module_utils/crypto/module_backends/publickey_info.py | 4 +++- plugins/modules/acme_challenge_cert_helper.py | 4 +++- plugins/modules/certificate_complete_chain.py | 4 +++- plugins/modules/ecs_certificate.py | 4 +++- plugins/modules/get_certificate.py | 4 +++- plugins/modules/openssl_dhparam.py | 4 +++- plugins/modules/openssl_pkcs12.py | 4 +++- plugins/modules/openssl_publickey.py | 4 +++- plugins/modules/openssl_signature.py | 4 +++- plugins/modules/openssl_signature_info.py | 4 +++- plugins/modules/x509_certificate_convert.py | 4 +++- plugins/modules/x509_crl.py | 4 +++- 20 files changed, 60 insertions(+), 20 deletions(-) diff --git a/plugins/module_utils/crypto/module_backends/certificate.py b/plugins/module_utils/crypto/module_backends/certificate.py index 671d5564..e8f6afda 100644 --- a/plugins/module_utils/crypto/module_backends/certificate.py +++ b/plugins/module_utils/crypto/module_backends/certificate.py @@ -330,7 +330,9 @@ def select_backend(module, provider): """ provider.validate_module_args(module) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) if provider.needs_version_two_certs(module): # TODO: remove diff --git a/plugins/module_utils/crypto/module_backends/certificate_info.py b/plugins/module_utils/crypto/module_backends/certificate_info.py index a5961943..d41ede93 100644 --- a/plugins/module_utils/crypto/module_backends/certificate_info.py +++ b/plugins/module_utils/crypto/module_backends/certificate_info.py @@ -434,5 +434,7 @@ def get_certificate_info(module, content, prefer_one_fingerprint=False): def select_backend(module, content): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return CertificateInfoRetrievalCryptography(module, content) diff --git a/plugins/module_utils/crypto/module_backends/crl_info.py b/plugins/module_utils/crypto/module_backends/crl_info.py index 4fb3f546..a52a1ba5 100644 --- a/plugins/module_utils/crypto/module_backends/crl_info.py +++ b/plugins/module_utils/crypto/module_backends/crl_info.py @@ -84,7 +84,9 @@ class CRLInfoRetrieval: def get_crl_info(module, content, list_revoked_certificates=True): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) info = CRLInfoRetrieval( module, content, list_revoked_certificates=list_revoked_certificates ) diff --git a/plugins/module_utils/crypto/module_backends/csr.py b/plugins/module_utils/crypto/module_backends/csr.py index 965cd980..f25d6b8e 100644 --- a/plugins/module_utils/crypto/module_backends/csr.py +++ b/plugins/module_utils/crypto/module_backends/csr.py @@ -733,7 +733,9 @@ class CertificateSigningRequestCryptographyBackend(CertificateSigningRequestBack def select_backend(module): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return CertificateSigningRequestCryptographyBackend(module) diff --git a/plugins/module_utils/crypto/module_backends/csr_info.py b/plugins/module_utils/crypto/module_backends/csr_info.py index 2a1166d4..3de6ee68 100644 --- a/plugins/module_utils/crypto/module_backends/csr_info.py +++ b/plugins/module_utils/crypto/module_backends/csr_info.py @@ -348,7 +348,9 @@ def get_csr_info( def select_backend(module, content, validate_signature=True): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return CSRInfoRetrievalCryptography( module, content, validate_signature=validate_signature ) diff --git a/plugins/module_utils/crypto/module_backends/privatekey.py b/plugins/module_utils/crypto/module_backends/privatekey.py index 5e45d012..def4f3b7 100644 --- a/plugins/module_utils/crypto/module_backends/privatekey.py +++ b/plugins/module_utils/crypto/module_backends/privatekey.py @@ -542,7 +542,9 @@ class PrivateKeyCryptographyBackend(PrivateKeyBackend): def select_backend(module): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return PrivateKeyCryptographyBackend(module) diff --git a/plugins/module_utils/crypto/module_backends/privatekey_convert.py b/plugins/module_utils/crypto/module_backends/privatekey_convert.py index 9627b7eb..3cbda2fd 100644 --- a/plugins/module_utils/crypto/module_backends/privatekey_convert.py +++ b/plugins/module_utils/crypto/module_backends/privatekey_convert.py @@ -248,7 +248,9 @@ class PrivateKeyConvertCryptographyBackend(PrivateKeyConvertBackend): def select_backend(module): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return PrivateKeyConvertCryptographyBackend(module) diff --git a/plugins/module_utils/crypto/module_backends/privatekey_info.py b/plugins/module_utils/crypto/module_backends/privatekey_info.py index 3e6fafec..613a894f 100644 --- a/plugins/module_utils/crypto/module_backends/privatekey_info.py +++ b/plugins/module_utils/crypto/module_backends/privatekey_info.py @@ -297,7 +297,9 @@ def select_backend( return_private_key_data=False, check_consistency=False, ): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return PrivateKeyInfoRetrievalCryptography( module, content, diff --git a/plugins/module_utils/crypto/module_backends/publickey_info.py b/plugins/module_utils/crypto/module_backends/publickey_info.py index 1ac2ee10..ae340bcf 100644 --- a/plugins/module_utils/crypto/module_backends/publickey_info.py +++ b/plugins/module_utils/crypto/module_backends/publickey_info.py @@ -144,5 +144,7 @@ def get_publickey_info(module, content=None, key=None, prefer_one_fingerprint=Fa def select_backend(module, content=None, key=None): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return PublicKeyInfoRetrievalCryptography(module, content=content, key=key) diff --git a/plugins/modules/acme_challenge_cert_helper.py b/plugins/modules/acme_challenge_cert_helper.py index 6b66ce35..5c303bb9 100644 --- a/plugins/modules/acme_challenge_cert_helper.py +++ b/plugins/modules/acme_challenge_cert_helper.py @@ -207,7 +207,9 @@ def main(): mutually_exclusive=(["private_key_src", "private_key_content"],), ) - assert_required_cryptography_version(COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION + ) try: # Get parameters diff --git a/plugins/modules/certificate_complete_chain.py b/plugins/modules/certificate_complete_chain.py index 33e1e458..ee981e7e 100644 --- a/plugins/modules/certificate_complete_chain.py +++ b/plugins/modules/certificate_complete_chain.py @@ -323,7 +323,9 @@ def main(): supports_check_mode=True, ) - assert_required_cryptography_version(COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION + ) # Load chain chain = parse_PEM_list(module, module.params["input_chain"], source="input chain") diff --git a/plugins/modules/ecs_certificate.py b/plugins/modules/ecs_certificate.py index 9e2bb52e..009fb44b 100644 --- a/plugins/modules/ecs_certificate.py +++ b/plugins/modules/ecs_certificate.py @@ -994,7 +994,9 @@ def main(): supports_check_mode=True, ) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) # If validate_only is used, pointing to an existing tracking_id is an invalid operation if module.params["tracking_id"]: diff --git a/plugins/modules/get_certificate.py b/plugins/modules/get_certificate.py index bfe66e04..98f827d1 100644 --- a/plugins/modules/get_certificate.py +++ b/plugins/modules/get_certificate.py @@ -361,7 +361,9 @@ def main(): f"The Python version used to run the get_certificate module is {sys.version}" ) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) result = dict( changed=False, diff --git a/plugins/modules/openssl_dhparam.py b/plugins/modules/openssl_dhparam.py index 28ceabb6..8b3fb028 100644 --- a/plugins/modules/openssl_dhparam.py +++ b/plugins/modules/openssl_dhparam.py @@ -411,7 +411,9 @@ def main(): if backend == "openssl": dhparam = DHParameterOpenSSL(module) elif backend == "cryptography": - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) dhparam = DHParameterCryptography(module) else: raise AssertionError("Internal error: unknown backend") diff --git a/plugins/modules/openssl_pkcs12.py b/plugins/modules/openssl_pkcs12.py index 93a8f35b..3640636c 100644 --- a/plugins/modules/openssl_pkcs12.py +++ b/plugins/modules/openssl_pkcs12.py @@ -712,7 +712,9 @@ class PkcsCryptography(Pkcs): def select_backend(module): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) return PkcsCryptography(module) diff --git a/plugins/modules/openssl_publickey.py b/plugins/modules/openssl_publickey.py index 62d22c5f..37375b24 100644 --- a/plugins/modules/openssl_publickey.py +++ b/plugins/modules/openssl_publickey.py @@ -428,7 +428,9 @@ def main(): mutually_exclusive=(["privatekey_path", "privatekey_content"],), ) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) base_dir = os.path.dirname(module.params["path"]) or "." if not os.path.isdir(base_dir): diff --git a/plugins/modules/openssl_signature.py b/plugins/modules/openssl_signature.py index 9c141727..6f0b0974 100644 --- a/plugins/modules/openssl_signature.py +++ b/plugins/modules/openssl_signature.py @@ -245,7 +245,9 @@ def main(): msg=f"The file {module.params['path']} does not exist", ) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) try: _sign = SignatureCryptography(module) diff --git a/plugins/modules/openssl_signature_info.py b/plugins/modules/openssl_signature_info.py index 7de9c7b6..1ac66899 100644 --- a/plugins/modules/openssl_signature_info.py +++ b/plugins/modules/openssl_signature_info.py @@ -250,7 +250,9 @@ def main(): msg=f"The file {module.params['path']} does not exist", ) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) try: _sign = SignatureInfoCryptography(module) diff --git a/plugins/modules/x509_certificate_convert.py b/plugins/modules/x509_certificate_convert.py index 5d7ab46a..e030e4cc 100644 --- a/plugins/modules/x509_certificate_convert.py +++ b/plugins/modules/x509_certificate_convert.py @@ -222,7 +222,9 @@ class X509CertificateConvertModule(OpenSSLObject): pass def verify_cert_parsable(self, module): - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) try: load_der_x509_certificate(self.input) except Exception as exc: diff --git a/plugins/modules/x509_crl.py b/plugins/modules/x509_crl.py index 1138f24f..a2b542d0 100644 --- a/plugins/modules/x509_crl.py +++ b/plugins/modules/x509_crl.py @@ -998,7 +998,9 @@ def main(): add_file_common_args=True, ) - assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION) + assert_required_cryptography_version( + module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION + ) try: crl = CRL(module)