diff --git a/IncBackups/views.py b/IncBackups/views.py index bca22263d..e122b05c9 100644 --- a/IncBackups/views.py +++ b/IncBackups/views.py @@ -340,8 +340,7 @@ def get_backup_status(request): else: return ACLManager.loadErrorJson('fetchStatus', 0) - if (status[:16] == "/home/cyberpanel" or status[:4] == '/tmp' or status[:18] == '/usr/local/CyberCP') \ - and status != '/usr/local/CyberCP/CyberCP/settings.py' and status.find('..') == -1: + if ACLManager.CheckStatusFilleLoc(status): pass else: data_ret = {'abort': 1, 'installStatus': 0, 'installationProgress': "100", diff --git a/plogical/acl.py b/plogical/acl.py index 6784b2f47..f548ce8d8 100644 --- a/plogical/acl.py +++ b/plogical/acl.py @@ -809,4 +809,15 @@ class ACLManager: return 1 + @staticmethod + def CheckStatusFilleLoc(statusFile): + if (statusFile[:18] != "/home/cyberpanel/." or statusFile[:16] == "/home/cyberpanel" or statusFile[ + :4] == '/tmp' or statusFile[ + :18] == '/usr/local/CyberCP') \ + and statusFile != '/usr/local/CyberCP/CyberCP/settings.py' and statusFile.find( + '..') == -1 and statusFile != '/home/cyberpanel/.my.cnf' and statusFile != '/home/cyberpanel/.bashrc' and statusFile != '/home/cyberpanel/.bash_logout' and statusFile != '/home/cyberpanel/.profile': + return 1 + else: + return 0 + diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index d34052b38..bcc4db7a5 100755 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -284,18 +284,16 @@ class backupUtilities: ## /home/example.com/backup/backup-example.com-02.13.2018_10-24-52/meta.xml -- metaPath - metaPath = '%s/%s' % (tempStoragePath, str(randint(1000, 9999))) + metaPath = '/tmp/%s' % (str(randint(1000, 9999))) if os.path.exists(ProcessUtilities.debugPath): logging.CyberCPLogFileWriter.writeToFile(f'Path to meta file {metaPath}') xmlpretty = prettify(metaFileXML).encode('ascii', 'ignore') - # metaFile = open(metaPath, 'w') - # metaFile.write(xmlpretty.decode()) - # metaFile.close() - #os.chmod(metaPath, 0o600) - - MetaContent = xmlpretty.decode() + metaFile = open(metaPath, 'w') + metaFile.write(xmlpretty.decode()) + metaFile.close() + os.chmod(metaPath, 0o600) ## meta generated @@ -1999,11 +1997,11 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain): return 0 - # command = 'chown %s:%s %s' % (website.externalApp, website.externalApp, result[2]) - # ProcessUtilities.executioner(command) + command = 'chown %s:%s %s' % (website.externalApp, website.externalApp, result[2]) + ProcessUtilities.executioner(command) - #logging.CyberCPLogFileWriter.writeToFile(backupPath) - #logging.CyberCPLogFileWriter.writeToFile(tempStoragePath) + logging.CyberCPLogFileWriter.writeToFile(backupPath) + logging.CyberCPLogFileWriter.writeToFile(tempStoragePath) execPath = "sudo nice -n 10 /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/backupUtilities.py" execPath = execPath + " startBackup --tempStoragePath " + tempStoragePath + " --backupName " \ diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index 684ff4636..64f59f80d 100644 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -273,8 +273,6 @@ class virtualHostUtilities: logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Website successfully created. [200]') - logging.CyberCPLogFileWriter.writeToFile ("hello world [createVirtualHost]") - return 1, 'None' except BaseException as msg: diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 813bbae94..a2c59a345 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -1854,10 +1854,7 @@ class WebsiteManager: try: statusFile = data['statusFile'] - if (statusFile[:18] != "/home/cyberpanel/." or statusFile[:16] == "/home/cyberpanel" or statusFile[:4] == '/tmp' or statusFile[ - :18] == '/usr/local/CyberCP') \ - and statusFile != '/usr/local/CyberCP/CyberCP/settings.py' and statusFile.find( - '..') == -1 and statusFile != '/home/cyberpanel/.my.cnf' and statusFile != '/home/cyberpanel/.bashrc' and statusFile != '/home/cyberpanel/.bash_logout' and statusFile != '/home/cyberpanel/.profile': + if ACLManager.CheckStatusFilleLoc(statusFile): pass else: data_ret = {'abort': 1, 'installStatus': 0, 'installationProgress': "100",