From de19af6f0469641da55ab0778abd69b8066122dc Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Tue, 20 Jul 2021 14:05:45 +0500
Subject: [PATCH] resolve https://github.com/usmannasir/cyberpanel/issues/696

---
 firewall/firewallManager.py |  6 +++---
 plogical/modSec.py          | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/firewall/firewallManager.py b/firewall/firewallManager.py
index b97ce8c11..03f763709 100755
--- a/firewall/firewallManager.py
+++ b/firewall/firewallManager.py
@@ -1130,7 +1130,7 @@ class FirewallManager:
 
             packName = data['packName']
 
-            confPath = os.path.join('/usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf')
+            confPath = os.path.join('/usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf')
 
             command = "sudo cat " + confPath
             httpdConfig = ProcessUtilities.outputExecutioner(command).splitlines()
@@ -1170,7 +1170,7 @@ class FirewallManager:
             return HttpResponse(final_json)
 
             # if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
-            #     confPath = os.path.join('/usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf')
+            #     confPath = os.path.join('/usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf')
             #
             #     command = "sudo cat " + confPath
             #     httpdConfig = ProcessUtilities.outputExecutioner(command).splitlines()
@@ -1210,7 +1210,7 @@ class FirewallManager:
             #     return HttpResponse(final_json)
             # else:
             #
-            #     command = 'cat /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf'
+            #     command = 'cat /usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf'
             #     files = ProcessUtilities.outputExecutioner(command).splitlines()
             #
             #     json_data = "["
diff --git a/plogical/modSec.py b/plogical/modSec.py
index 1960af5e5..9c475b549 100755
--- a/plogical/modSec.py
+++ b/plogical/modSec.py
@@ -400,7 +400,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf
     def setupOWASPRules():
         try:
             pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/owasp")
-            pathToOWASFolderNew = '%s/modsec/owasp-modsecurity-crs-3.0-master' % (virtualHostUtilities.vhostConfPath)
+            pathToOWASFolderNew = '%s/modsec/coreruleset-3.3.2' % (virtualHostUtilities.vhostConfPath)
 
             command = 'mkdir -p /usr/local/lsws/conf/modsec'
             result = subprocess.call(shlex.split(command))
@@ -495,7 +495,7 @@ include {pathToOWASFolderNew}/rules/RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf
 
             if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
                 owaspRulesConf = """
-modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf
+modsecurity_rules_file /usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf
 """
 
                 confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf")
@@ -522,7 +522,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
                 for items in confData:
                     if items.find('/conf/comodo_litespeed/') > -1:
                         conf.writelines(items)
-                        conf.write('Include /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/*.conf\n')
+                        conf.write('Include /usr/local/lsws/conf/modsec/coreruleset-3.3.2/*.conf\n')
                         continue
                     else:
                         conf.writelines(items)
@@ -566,7 +566,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
     def disableRuleFile(fileName, packName):
         try:
 
-            confFile = os.path.join('/usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf')
+            confFile = os.path.join('/usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf')
             confData = open(confFile).readlines()
             conf = open(confFile, 'w')
 
@@ -591,7 +591,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
     def enableRuleFile(fileName, packName):
         try:
 
-            confFile = os.path.join('/usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf')
+            confFile = os.path.join('/usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf')
             confData = open(confFile).readlines()
             conf = open(confFile, 'w')
 
@@ -604,7 +604,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
             conf.close()
 
             # if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
-            #     confFile = os.path.join('/usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-master/owasp-master.conf')
+            #     confFile = os.path.join('/usr/local/lsws/conf/modsec/coreruleset-3.3.2/owasp-master.conf')
             #     confData = open(confFile).readlines()
             #     conf = open(confFile, 'w')
             #