From 5b958cc0f4f88d79fe108dfdcafaba9699e89604 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Tue, 6 Sep 2022 14:12:28 +0500 Subject: [PATCH] bug fix in cp --- plogical/sslUtilities.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py index d94fad5f3..bef0fcff1 100755 --- a/plogical/sslUtilities.py +++ b/plogical/sslUtilities.py @@ -303,7 +303,7 @@ class sslUtilities: f'Status Code: {str(resp.status_code)} for: {URLFetchPathWWW}. Error: {resp.text}') except BaseException as msg: logging.CyberCPLogFileWriter.writeToFile( - f'Status Code: Unkown for: {URLFetchPathWWW}. Error: {str(msg)}') + f'Status Code: Unknown for: {URLFetchPathWWW}. Error: {str(msg)}') try: resp = requests.get(URLFetchPathNONWWW, timeout=5) @@ -339,9 +339,11 @@ class sslUtilities: command = acmePath + " --issue -d " + virtualHostName + " -d www." + virtualHostName \ + ' --cert-file ' + existingCertPath + '/cert.pem' + ' --key-file ' + existingCertPath + '/privkey.pem' \ + ' --fullchain-file ' + existingCertPath + '/fullchain.pem' + ' -w /usr/local/lsws/Example/html -k ec-256 --force --server letsencrypt' + ResultText = open(logging.CyberCPLogFileWriter.fileName, 'r').read() + CurrentMessage = "Trying to obtain SSL for: " + virtualHostName + " and: www." + virtualHostName + if (WWWStatus and NONWWWStatus) or ResultText.find(CurrentMessage) == -1: - if WWWStatus and NONWWWStatus: - logging.CyberCPLogFileWriter.writeToFile("Trying to obtain SSL for: " + virtualHostName + " and: www." + virtualHostName, 0) + #logging.CyberCPLogFileWriter.writeToFile(CurrentMessage, 0) logging.CyberCPLogFileWriter.writeToFile(command, 0) @@ -364,7 +366,10 @@ class sslUtilities: + '/cert.pem' + ' --key-file ' + existingCertPath + '/privkey.pem' \ + ' --fullchain-file ' + existingCertPath + '/fullchain.pem' + ' -w /usr/local/lsws/Example/html -k ec-256 --force --server letsencrypt' - if NONWWWStatus: + ResultText = open(logging.CyberCPLogFileWriter.fileName, 'r').read() + CurrentMessage = '%s\nTrying to obtain SSL for: %s' % (finalText, virtualHostName) + + if NONWWWStatus or ResultText.find(CurrentMessage) == -1: finalText = '%s\nTrying to obtain SSL for: %s' % (finalText, virtualHostName) logging.CyberCPLogFileWriter.writeToFile("Trying to obtain SSL for: " + virtualHostName, 0) output = subprocess.check_output(shlex.split(command)).decode("utf-8")