From 5fbae06c0077544e42f4556e91d745c32e063afd Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 11 Nov 2022 19:23:18 +0800 Subject: [PATCH] Update cert_request.py --- class/core/cert_request.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/class/core/cert_request.py b/class/core/cert_request.py index e92d14376..9d3fc88cb 100644 --- a/class/core/cert_request.py +++ b/class/core/cert_request.py @@ -1011,6 +1011,16 @@ fullchain.pem 粘贴到证书输入框 except: writeLog(public.getTracebackInfo()) + # 获取证书到期时间 + def getCertTimeout(self, cret_data): + try: + x509 = OpenSSL.crypto.load_certificate( + OpenSSL.crypto.FILETYPE_PEM, cret_data) + cert_timeout = bytes.decode(x509.get_notAfter())[:-1] + return int(time.mktime(time.strptime(cert_timeout, '%Y%m%d%H%M%S'))) + except: + return int(time.time() + (86400 * 90)) + # 下载证书 def downloadCert(self, index): res = self.acmeRequest( @@ -1021,8 +1031,8 @@ fullchain.pem 粘贴到证书输入框 pem_certificate = res.content if type(pem_certificate) == bytes: pem_certificate = pem_certificate.decode('utf-8') - cert = self.split_ca_data(pem_certificate) - cert['cert_timeout'] = self.get_cert_timeout(cert['cert']) + cert = self.splitCaData(pem_certificate) + cert['cert_timeout'] = self.getCertTimeout(cert['cert']) cert['private_key'] = self.__config['orders'][index]['private_key'] cert['domains'] = self.__config['orders'][index]['domains'] del(self.__config['orders'][index]['private_key'])