From 798a481e12775105368ca83dd4afa6bf8d452e65 Mon Sep 17 00:00:00 2001 From: Calyso Date: Tue, 6 Sep 2022 13:39:27 -0400 Subject: [PATCH 1/6] Correct Typo in cyberpanel_utility.sh --- cyberpanel_utility.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cyberpanel_utility.sh b/cyberpanel_utility.sh index 779d2b740..9573470e9 100644 --- a/cyberpanel_utility.sh +++ b/cyberpanel_utility.sh @@ -432,7 +432,7 @@ sudo_check() { echo -e "\nYou must use root user to use CyberPanel Utility..." exit else - echo -e "\nYou are runing as root..." + echo -e "\nYou are running as root..." fi } From f999d82339483a889d8dabcd5f11bb431c04e2cf Mon Sep 17 00:00:00 2001 From: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:02:03 -0400 Subject: [PATCH 2/6] Adding IPv6 listeners --- install/litespeed/conf/httpd_config.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/litespeed/conf/httpd_config.conf b/install/litespeed/conf/httpd_config.conf index 74c4402e3..abebf2d8e 100755 --- a/install/litespeed/conf/httpd_config.conf +++ b/install/litespeed/conf/httpd_config.conf @@ -163,7 +163,11 @@ listener Default{ map Example * } - +listener Default IPv6{ + address [ANY]:80 + secure 0 + map Example * +} vhTemplate centralConfigLog { templateFile $SERVER_ROOT/conf/templates/ccl.conf From 385b7e54f3eb7ca742326fc45b0ecb5dcb81a0e0 Mon Sep 17 00:00:00 2001 From: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:04:15 -0400 Subject: [PATCH 3/6] Adding IPv6 listeners --- serverStatus/litespeed/conf/httpd_config.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/serverStatus/litespeed/conf/httpd_config.conf b/serverStatus/litespeed/conf/httpd_config.conf index 31783e118..d3202a075 100755 --- a/serverStatus/litespeed/conf/httpd_config.conf +++ b/serverStatus/litespeed/conf/httpd_config.conf @@ -162,7 +162,11 @@ listener Default{ map Example * } - +listener Default IPv6{ + address [ANY]:80 + secure 0 + map Example * +} vhTemplate centralConfigLog { templateFile $SERVER_ROOT/conf/templates/ccl.conf From a0a5cb2d8546caaa6fc2449364169b94e346c4aa Mon Sep 17 00:00:00 2001 From: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:05:03 -0400 Subject: [PATCH 4/6] Adding IPv6 listeners --- serverStatus/litespeed/conf/httpd_config.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/serverStatus/litespeed/conf/httpd_config.conf b/serverStatus/litespeed/conf/httpd_config.conf index d3202a075..b684078c1 100755 --- a/serverStatus/litespeed/conf/httpd_config.conf +++ b/serverStatus/litespeed/conf/httpd_config.conf @@ -168,6 +168,7 @@ listener Default IPv6{ map Example * } + vhTemplate centralConfigLog { templateFile $SERVER_ROOT/conf/templates/ccl.conf listeners Default From 5ae3067b12f0750d2a840ed3292dc35ca808cb22 Mon Sep 17 00:00:00 2001 From: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:30:19 -0400 Subject: [PATCH 5/6] Update httpd_config.conf --- install/litespeed/conf/httpd_config.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/install/litespeed/conf/httpd_config.conf b/install/litespeed/conf/httpd_config.conf index abebf2d8e..8b65fc2d1 100755 --- a/install/litespeed/conf/httpd_config.conf +++ b/install/litespeed/conf/httpd_config.conf @@ -169,6 +169,7 @@ listener Default IPv6{ map Example * } + vhTemplate centralConfigLog { templateFile $SERVER_ROOT/conf/templates/ccl.conf listeners Default From f6c0e78cc0ef3b8892dbd2b59b7bef271a382623 Mon Sep 17 00:00:00 2001 From: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:44:58 -0400 Subject: [PATCH 6/6] Adding preliminary IPv6 SSL functions Very likely needs testing and reworking --- plogical/sslUtilities.py | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py index bef0fcff1..81bfb31c8 100755 --- a/plogical/sslUtilities.py +++ b/plogical/sslUtilities.py @@ -52,6 +52,20 @@ class sslUtilities: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with main config file [checkSSLListener]]") return str(msg) return 0 + + + @staticmethod + def checkSSLIPv6Listener(): + try: + data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() + for items in data: + if items.find("listener SSL IPv6") > -1: + return 1 + + except BaseException as msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with main config file [checkSSLIPv6Listener]]") + return str(msg) + return 0 @staticmethod def getDNSRecords(virtualHostName): @@ -120,6 +134,45 @@ class sslUtilities: writeDataToFile.writelines("\n") writeDataToFile.close() + elif sslUtilities.checkSSLIPv6Listener() != 1: + + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') + + listener = "listener SSL IPv6 {" + "\n" + address = " address [ANY]:443" + "\n" + secure = " secure 1" + "\n" + keyFile = " keyFile /etc/letsencrypt/live/" + virtualHostName + "/privkey.pem\n" + certFile = " certFile /etc/letsencrypt/live/" + virtualHostName + "/fullchain.pem\n" + certChain = " certChain 1" + "\n" + sslProtocol = " sslProtocol 24" + "\n" + enableECDHE = " enableECDHE 1" + "\n" + renegProtection = " renegProtection 1" + "\n" + sslSessionCache = " sslSessionCache 1" + "\n" + enableSpdy = " enableSpdy 15" + "\n" + enableStapling = " enableStapling 1" + "\n" + ocspRespMaxAge = " ocspRespMaxAge 86400" + "\n" + map = " map " + virtualHostName + " " + virtualHostName + "\n" + final = "}" + "\n" + "\n" + + writeDataToFile.writelines("\n") + writeDataToFile.writelines(listener) + writeDataToFile.writelines(address) + writeDataToFile.writelines(secure) + writeDataToFile.writelines(keyFile) + writeDataToFile.writelines(certFile) + writeDataToFile.writelines(certChain) + writeDataToFile.writelines(sslProtocol) + writeDataToFile.writelines(enableECDHE) + writeDataToFile.writelines(renegProtection) + writeDataToFile.writelines(sslSessionCache) + writeDataToFile.writelines(enableSpdy) + writeDataToFile.writelines(enableStapling) + writeDataToFile.writelines(ocspRespMaxAge) + writeDataToFile.writelines(map) + writeDataToFile.writelines(final) + writeDataToFile.writelines("\n") + writeDataToFile.close() + else: if sslUtilities.checkIfSSLMap(virtualHostName) == 0: