Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor sslutils

Browse Source
This commit is contained in:
VirtuBox
2019-04-08 12:38:01 +02:00
parent 3b1cb2f1d5
commit 4d5b8af45d
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wo/core/sslutils.py
View File

@@ -9,7 +9,8 @@ class SSL:
# check if exist # check if exist
if not os.path.isfile('/etc/letsencrypt/live/{0}/cert.pem' if not os.path.isfile('/etc/letsencrypt/live/{0}/cert.pem'
.format(domain)): .format(domain)):
Log.error(self, 'File Not Found : /etc/letsencrypt/live/{0}/cert.pem' Log.error(self, 'File Not Found: "
"/etc/letsencrypt/live/{0}/cert.pem'"
.format(domain), False) .format(domain), False)
if returnonerror: if returnonerror:
return -1 return -1
@@ -17,8 +18,14 @@ class SSL:
"`tail /var/log/wo/wordops.log` and please try again...") "`tail /var/log/wo/wordops.log` and please try again...")
current_date = WOShellExec.cmd_exec_stdout(self, "date -d \"now\" +%s") current_date = WOShellExec.cmd_exec_stdout(self, "date -d \"now\" +%s")
expiration_date = WOShellExec.cmd_exec_stdout(self, "date -d \"`openssl x509 -in /etc/letsencrypt/live/{0}/cert.pem" expiration_date = WOShellExec.cmd_exec_stdout(self, "date -d \""
" -text -noout|grep \"Not After\"|cut -c 25-`\" +%s".format(domain)) "`openssl x509 -in "
"/etc/letsencrypt/live/"
"{0}/cert.pem"
" -text -noout|grep "
"\"Not After\"|"
"cut -c 25-`\" "
"+%s".format(domain))
days_left = int((int(expiration_date) - int(current_date)) / 86400) days_left = int((int(expiration_date) - int(current_date)) / 86400)
if (days_left > 0): if (days_left > 0):
@@ -31,11 +38,18 @@ class SSL:
# check if exist # check if exist
if not os.path.isfile('/etc/letsencrypt/live/{0}/cert.pem' if not os.path.isfile('/etc/letsencrypt/live/{0}/cert.pem'
.format(domain)): .format(domain)):
Log.error(self, 'File Not Found : /etc/letsencrypt/live/{0}/cert.pem' Log.error(self, 'File Not Found: "/etc/letsencrypt/"
"live/{0}/cert.pem'"
.format(domain), False) .format(domain), False)
Log.error(self, "Check the WordOps log for more details " Log.error(self, "Check the WordOps log for more details "
"`tail /var/log/wo/wordops.log` and please try again...") "`tail /var/log/wo/wordops.log` and please try again...")
expiration_date = WOShellExec.cmd_exec_stdout(self, "date -d \"`openssl x509 -in /etc/letsencrypt/live/{0}/cert.pem" expiration_date = WOShellExec.cmd_exec_stdout(self, "date -d "
" -text -noout|grep \"Not After\"|cut -c 25-`\" ".format(domain)) "\"`openssl x509 -in "
"/etc/letsencrypt/live/"
"{0}/cert.pem"
" -text -noout|grep "
"\"Not After\"|"
"cut -c 25-`\" "
.format(domain))
return expiration_date return expiration_date