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

bug fix: https://www.facebook.com/groups/cyberpanel/posts/3234831330161826/

Browse Source
This commit is contained in:
usman@cyberpersons.com
2022-12-30 21:04:35 +05:00
parent e67c8512c3
commit 4de1040637
3 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plogical/IncScheduler.py
View File

@@ -1352,12 +1352,6 @@ Automatic backup failed for %s on %s.
except BaseException as msg: except BaseException as msg:
print("Version ID Error: %s"%str(msg)) print("Version ID Error: %s"%str(msg))
except BaseException as msg: except BaseException as msg:
print('%s. [SendToS3Cloud]' % (str(msg))) print('%s. [SendToS3Cloud]' % (str(msg)))
logging.writeToFile('%s. [SendToS3Cloud]' % (str(msg))) logging.writeToFile('%s. [SendToS3Cloud]' % (str(msg)))

17
plogical/modSec.py
View File

@@ -547,7 +547,7 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
@staticmethod @staticmethod
def disableOWASP(): def disableOWASP():
try: try:
if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf")
confData = open(confFile).readlines() confData = open(confFile).readlines()
conf = open(confFile, 'w') conf = open(confFile, 'w')
@@ -561,6 +561,21 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/owasp-modsecurity-crs-3.0-mas
conf.close() conf.close()
installUtilities.reStartLiteSpeed() installUtilities.reStartLiteSpeed()
print("1,None")
else:
confFile = os.path.join("/usr/local/lsws/conf/modsec.conf")
confData = open(confFile).readlines()
conf = open(confFile, 'w')
for items in confData:
if items.find('modsec/owasp') > -1:
continue
else:
conf.writelines(items)
conf.close()
installUtilities.reStartLiteSpeed()
print("1,None") print("1,None")
except BaseException as msg: except BaseException as msg:

6
websiteFunctions/website.py
View File

@@ -1286,6 +1286,9 @@ class WebsiteManager:
RemoteBackupConfigobj = RemoteBackupConfig.objects.get(pk=RemoteConfigID) RemoteBackupConfigobj = RemoteBackupConfig.objects.get(pk=RemoteConfigID)
Rconfig = json.loads(RemoteBackupConfigobj.config) Rconfig = json.loads(RemoteBackupConfigobj.config)
try:
#This code is only supposed to run if backups are s3, not for SFTP
provider = Rconfig['Provider'] provider = Rconfig['Provider']
if provider == "Backblaze": if provider == "Backblaze":
EndURl = Rconfig['EndUrl'] EndURl = Rconfig['EndUrl']
@@ -1322,6 +1325,9 @@ class WebsiteManager:
'BackupType': BackupType, 'BackupType': BackupType,
'BucketName': BucketName 'BucketName': BucketName
} }
except BaseException as msg:
config = {}
pass
svobj = RemoteBackupSchedule(RemoteBackupConfig=RemoteBackupConfigobj, Name=ScheduleName, svobj = RemoteBackupSchedule(RemoteBackupConfig=RemoteBackupConfigobj, Name=ScheduleName,
timeintervel=Backfrequency, fileretention=FileRetention, timeintervel=Backfrequency, fileretention=FileRetention,