One more thing for 7.5.1

- Make the `expires` timestamp more readable
domainaware · Oct 29, 2024 · fba6d47 · fba6d47
1 parent f3b9851
commit fba6d47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Changelog
 
 - Properly parse a certificate SAN
 - Certificate warnings fire properly
+- Make the `expires` timestamp more readable
 
 5.7.0
 -----

diff --git a/checkdmarc/bimi.py b/checkdmarc/bimi.py
@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import logging
+from datetime import datetime
 from typing import Union
 import re
 from collections import OrderedDict
@@ -278,8 +279,10 @@ def decode_components(components: dict):
         vmc = loaded_certs[0]
         metadata["issuer"] = decode_components(vmc.get_issuer().get_components())
         metadata["subject"] = decode_components(vmc.get_subject().get_components())
-        metadata["serial_number"] = vmc.get_serial_number()
-        metadata["expires"] = str(vmc.get_notAfter())
+        metadata["serial_number"] = vmc.get_serial_number().__str__()
+        metadata["expires"] = vmc.get_notAfter().decode("utf-8", errors="ignore")
+        metadata["expires"] = datetime.strptime(metadata["expires"], "%Y%m%d%H%M%SZ")
+        metadata["expires"] = metadata["expires"].strftime("%Y-%m-%d %H:%M:%SZ")
         metadata["valid"] = valid and not vmc.has_expired()
         san = _get_certificate_san(vmc)
         metadata["domains"] = san