a-c-m
/
community.crypto
mirror of https://github.com/ansible-collections/community.crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support InvalidityDate.invalidity_date_utc. (#730)

pull/789/head
Felix Fontein 2024-07-21 13:04:13 +02:00 committed by GitHub
parent e1e60892a8
commit cb3f55076e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/730-cryptography-invalidity_date.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- When using cryptography >= 43.0.0, use offset-aware ``datetime.datetime`` objects (with timezone UTC) instead of offset-naive UTC timestamps for the ``InvalidityDate`` X.509 CRL extension (https://github.com/ansible-collections/community.crypto/issues/726, https://github.com/ansible-collections/community.crypto/pull/730).

8
plugins/module_utils/crypto/cryptography_crl.py
View File

@ -8,7 +8,10 @@ from __future__ import absolute_import, division, print_function
__metaclass__ = type __metaclass__ = type
from ansible_collections.community.crypto.plugins.module_utils.version import LooseVersion as _LooseVersion
try: try:
import cryptography
from cryptography import x509 from cryptography import x509
except ImportError: except ImportError:
# Error handled in the calling module. # Error handled in the calling module.
@ -32,6 +35,8 @@ from ._obj2txt import (
# to True and adjust get_invalidity_date() accordingly. # to True and adjust get_invalidity_date() accordingly.
# (https://github.com/pyca/cryptography/issues/10818) # (https://github.com/pyca/cryptography/issues/10818)
CRYPTOGRAPHY_TIMEZONE_INVALIDITY_DATE = False CRYPTOGRAPHY_TIMEZONE_INVALIDITY_DATE = False
if HAS_CRYPTOGRAPHY:
CRYPTOGRAPHY_TIMEZONE_INVALIDITY_DATE = _LooseVersion(cryptography.__version__) >= _LooseVersion('43.0.0')
TIMESTAMP_FORMAT = "%Y%m%d%H%M%SZ" TIMESTAMP_FORMAT = "%Y%m%d%H%M%SZ"
@ -139,7 +144,8 @@ def get_revocation_date(obj):
def get_invalidity_date(obj): def get_invalidity_date(obj):
# TODO: special handling if CRYPTOGRAPHY_TIMEZONE_INVALIDITY_DATE is True if CRYPTOGRAPHY_TIMEZONE_INVALIDITY_DATE:
return obj.invalidity_date_utc
return obj.invalidity_date return obj.invalidity_date