Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-11 15:56:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve https://github.com/usmannasir/cyberpanel/issues/696

Browse Source
This commit is contained in:
Usman Nasir
2021-07-20 14:05:45 +05:00
parent c8f723159b
commit 4d9a95ded1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firewall/firewallManager.py
View File

@@ -1130,7 +1130,7 @@ class FirewallManager:
packName = data['packName'] 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 command = "sudo cat " + confPath
httpdConfig = ProcessUtilities.outputExecutioner(command).splitlines() httpdConfig = ProcessUtilities.outputExecutioner(command).splitlines()
@@ -1170,7 +1170,7 @@ class FirewallManager:
return HttpResponse(final_json) return HttpResponse(final_json)
# if ProcessUtilities.decideServer() == ProcessUtilities.OLS: # 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 # command = "sudo cat " + confPath
# httpdConfig = ProcessUtilities.outputExecutioner(command).splitlines() # httpdConfig = ProcessUtilities.outputExecutioner(command).splitlines()
@@ -1210,7 +1210,7 @@ class FirewallManager:
# return HttpResponse(final_json) # return HttpResponse(final_json)
# else: # 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() # files = ProcessUtilities.outputExecutioner(command).splitlines()
# #
# json_data = "[" # json_data = "["

12
plogical/modSec.py
View File

@@ -400,7 +400,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf
def setupOWASPRules(): def setupOWASPRules():
try: try:
pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/owasp") 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' command = 'mkdir -p /usr/local/lsws/conf/modsec'
result = subprocess.call(shlex.split(command)) 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: if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
owaspRulesConf = """ 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") 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: for items in confData:
if items.find('/conf/comodo_litespeed/') > -1: if items.find('/conf/comodo_litespeed/') > -1:
conf.writelines(items) 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 continue
else: else:
conf.writelines(items) 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): def disableRuleFile(fileName, packName):
try: 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() confData = open(confFile).readlines()
conf = open(confFile, 'w') 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): def enableRuleFile(fileName, packName):
try: 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() confData = open(confFile).readlines()
conf = open(confFile, 'w') conf = open(confFile, 'w')
@@ -604,7 +604,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
conf.close() conf.close()
# if ProcessUtilities.decideServer() == ProcessUtilities.OLS: # 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() # confData = open(confFile).readlines()
# conf = open(confFile, 'w') # conf = open(confFile, 'w')
# #