From 0a8831e76642dc99826a79c70d691b7c1277870e Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 17 Nov 2022 01:15:17 +0800 Subject: [PATCH] Update site_api.py --- class/core/site_api.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index 4024c2b08..670228fa1 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -601,7 +601,7 @@ class site_api: def removeCertApi(self): certName = request.form.get('certName', '') try: - path = self.sslDir + certName + path = self.sslDir + '/' + certName if not os.path.exists(path): return mw.returnJson(False, '证书已不存在!') os.system("rm -rf " + path) @@ -659,6 +659,31 @@ class site_api: mw.restartWeb() return mw.returnJson(True, 'SSL已关闭!') + def deploySslApi(self): + site_name = request.form.get('site_name', '') + ssl_type = request.form.get('ssl_type', '') + + path = self.sslDir + '/' + site_name + csr_path = path + '/fullchain.pem' # 生成证书路径 + + file = self.getHostConf(site_name) + content = mw.readFile(file) + key_text = 'ssl_certificate' + status = True + if content.find(key_text) == -1: + status = False + + if ssl_type == 'lets': + ssl_lets_dir = self.sslLetsDir + '/' + site_name + csr_lets_path = ssl_lets_dir + '/fullchain.pem' # 生成证书路径 + if mw.md5(mw.readFile(csr_lets_path)) == mw.md5(mw.readFile(csr_path)): + return mw.returnJson(False, '已部署Lets') + elif ssl_type == 'acme': + ssl_acme_dir = mw.getAcmeDir() + '/' + site_name + csr_acme_path = ssl_acme_dir + '/fullchain.cer' # 生成证书路径 + if mw.md5(mw.readFile(csr_acme_path)) == mw.md5(mw.readFile(csr_path)): + return mw.returnJson(False, '已部署Acme') + def getLetLogsApi(self): log_file = mw.getRunDir() + '/logs/letsencrypt.log' if not os.path.exists(log_file):