From c6cfe2a22ca5bbb8b111cda539d657032b1bbd7b Mon Sep 17 00:00:00 2001 From: dami Date: Sun, 28 Jun 2026 22:34:51 +0800 Subject: [PATCH] Update mw.py --- web/core/mw.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/web/core/mw.py b/web/core/mw.py index 46d496a69..b8254158b 100644 --- a/web/core/mw.py +++ b/web/core/mw.py @@ -1720,10 +1720,16 @@ def getCertName(certPath): result['issuer'] = attr.value break - # 取到期时间 - result['notAfter'] = strfDate(cert.not_valid_after.strftime('%Y%m%d%H%M%S')) - # 取申请时间 - result['notBefore'] = strfDate(cert.not_valid_before.strftime('%Y%m%d%H%M%S')) + # 取到期时间(兼容新旧版本) + if hasattr(cert, 'not_valid_after_utc'): + result['notAfter'] = strfDate(cert.not_valid_after_utc.strftime('%Y%m%d%H%M%S')) + else: + result['notAfter'] = strfDate(cert.not_valid_after.strftime('%Y%m%d%H%M%S')) + # 取申请时间(兼容新旧版本) + if hasattr(cert, 'not_valid_before_utc'): + result['notBefore'] = strfDate(cert.not_valid_before_utc.strftime('%Y%m%d%H%M%S')) + else: + result['notBefore'] = strfDate(cert.not_valid_before.strftime('%Y%m%d%H%M%S')) # 取可选名称 (SAN) result['dns'] = []