From 1c3df3d361f2070053ab2b7e48ef37c0a9d42638 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Fri, 9 Nov 2018 22:01:28 +0500 Subject: [PATCH] lsws switch --- api/views.py | 3 +- firewall/firewallManager.py | 565 +++++-- firewall/static/firewall/firewall.js | 6 - firewall/templates/firewall/modSecurity.html | 533 +++++-- ftp/ftpManager.py | 3 - install/install.py | 36 +- install/installCyberPanel.py | 1 - plogical/CyberCPLogFileWriter.py | 2 +- plogical/filemanager.py | 7 +- plogical/installUtilities.py | 25 +- plogical/modSec.py | 293 ++-- plogical/processUtilities.py | 76 +- plogical/sslUtilities.py | 272 ++-- plogical/vhost.py | 1138 ++++++++------ plogical/website.py | 1 - .../FileManager/.idea/FIleManager.iml | 8 + .../litespeed/FileManager/.idea/modules.xml | 8 + .../litespeed/FileManager/.idea/workspace.xml | 600 ++++++++ .../litespeed/FileManager/php/caller.php | 127 ++ .../litespeed/FileManager/php/fileManager.php | 748 +++++++++ .../litespeed/FileManager/php/temp.txt | 0 .../litespeed/FileManager/php/tests.php | 0 serverStatus/litespeed/conf/httpd_config.conf | 202 +++ serverStatus/litespeed/conf/mime.properties | 158 ++ .../litespeed/conf/templates/ccl.conf | 86 ++ .../litespeed/conf/templates/ccl.conf0,v | 111 ++ .../litespeed/conf/templates/phpsuexec.conf | 100 ++ .../conf/templates/phpsuexec.conf0,v | 125 ++ .../litespeed/conf/templates/rails.conf | 76 + .../litespeed/conf/templates/rails.conf0,v | 101 ++ .../litespeed/conf/vhosts/Example/htgroup | 4 + .../litespeed/conf/vhosts/Example/htpasswd | 2 + .../litespeed/conf/vhosts/Example/vhconf.conf | 119 ++ serverStatus/litespeed/functions.sh | 1364 +++++++++++++++++ serverStatus/litespeed/httpd.conf | 67 + serverStatus/litespeed/httpd_config.xml | 388 +++++ serverStatus/litespeed/install.sh | 506 ++++++ serverStatus/litespeed/modsec.conf | 21 + serverStatus/serverStatusUtil.py | 213 +++ serverStatus/static/images/agreement.png | Bin 0 -> 2173 bytes serverStatus/static/images/change.png | Bin 0 -> 1125 bytes serverStatus/static/images/litespeed-logo.png | Bin 0 -> 22141 bytes .../static/serverStatus/serverStatus.js | 843 ++++++---- .../serverStatus/litespeedStatus.html | 328 +++- .../templates/serverStatus/services.html | 2 +- serverStatus/urls.py | 18 +- serverStatus/views.py | 154 +- static/firewall/firewall.js | 6 - static/images/litespeed-logo.png | Bin 0 -> 22141 bytes static/serverStatus/serverStatus.js | 731 +++++---- 50 files changed, 8430 insertions(+), 1747 deletions(-) create mode 100644 serverStatus/litespeed/FileManager/.idea/FIleManager.iml create mode 100644 serverStatus/litespeed/FileManager/.idea/modules.xml create mode 100644 serverStatus/litespeed/FileManager/.idea/workspace.xml create mode 100755 serverStatus/litespeed/FileManager/php/caller.php create mode 100755 serverStatus/litespeed/FileManager/php/fileManager.php create mode 100644 serverStatus/litespeed/FileManager/php/temp.txt create mode 100644 serverStatus/litespeed/FileManager/php/tests.php create mode 100644 serverStatus/litespeed/conf/httpd_config.conf create mode 100755 serverStatus/litespeed/conf/mime.properties create mode 100755 serverStatus/litespeed/conf/templates/ccl.conf create mode 100755 serverStatus/litespeed/conf/templates/ccl.conf0,v create mode 100755 serverStatus/litespeed/conf/templates/phpsuexec.conf create mode 100755 serverStatus/litespeed/conf/templates/phpsuexec.conf0,v create mode 100755 serverStatus/litespeed/conf/templates/rails.conf create mode 100755 serverStatus/litespeed/conf/templates/rails.conf0,v create mode 100755 serverStatus/litespeed/conf/vhosts/Example/htgroup create mode 100755 serverStatus/litespeed/conf/vhosts/Example/htpasswd create mode 100644 serverStatus/litespeed/conf/vhosts/Example/vhconf.conf create mode 100644 serverStatus/litespeed/functions.sh create mode 100644 serverStatus/litespeed/httpd.conf create mode 100644 serverStatus/litespeed/httpd_config.xml create mode 100644 serverStatus/litespeed/install.sh create mode 100644 serverStatus/litespeed/modsec.conf create mode 100644 serverStatus/serverStatusUtil.py create mode 100644 serverStatus/static/images/agreement.png create mode 100644 serverStatus/static/images/change.png create mode 100644 serverStatus/static/images/litespeed-logo.png create mode 100644 static/images/litespeed-logo.png diff --git a/api/views.py b/api/views.py index d8fed2a67..bef494afe 100644 --- a/api/views.py +++ b/api/views.py @@ -567,8 +567,9 @@ def changeAdminPassword(request): 'error_message': "None"} json_data = json.dumps(data_ret) return HttpResponse(json_data) + os.remove(randomFile) - admin = Administrator.objects.get(pk="admin") + admin = Administrator.objects.get(userName="admin") admin.password = hashPassword.hash_password(adminPass) admin.save() data_ret = {"changed": 1, diff --git a/firewall/firewallManager.py b/firewall/firewallManager.py index aca646aec..d34581a31 100644 --- a/firewall/firewallManager.py +++ b/firewall/firewallManager.py @@ -13,16 +13,15 @@ from plogical.virtualHostUtilities import virtualHostUtilities import subprocess import shlex from plogical.installUtilities import installUtilities -from django.shortcuts import HttpResponse, render, redirect -from loginSystem.models import Administrator +from django.shortcuts import HttpResponse, render from random import randint import time -from loginSystem.views import loadLoginPage from plogical.firewallUtilities import FirewallUtilities from firewall.models import FirewallRules import thread from plogical.modSec import modSec from plogical.csf import CSF +from plogical.processUtilities import ProcessUtilities class FirewallManager: @@ -604,18 +603,24 @@ class FirewallManager: else: return ACLManager.loadError() - confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + OLS = 1 + confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") - command = "sudo cat " + confPath - httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + command = "sudo cat " + confPath + httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() - modSecInstalled = 0 + modSecInstalled = 0 - for items in httpdConfig: - if items.find('module mod_security') > -1: - modSecInstalled = 1 - break - return render(request, 'firewall/modSecurity.html', {'modSecInstalled': modSecInstalled}) + for items in httpdConfig: + if items.find('module mod_security') > -1: + modSecInstalled = 1 + break + else: + OLS = 0 + modSecInstalled = 1 + + return render(request, 'firewall/modSecurity.html', {'modSecInstalled': modSecInstalled, 'OLS': OLS}) except BaseException, msg: return HttpResponse(str(msg)) @@ -702,29 +707,89 @@ class FirewallManager: else: return ACLManager.loadErrorJson('fetchStatus', 0) - modsecurity = 0 - SecAuditEngine = 0 - SecRuleEngine = 0 - SecDebugLogLevel = "9" - SecAuditLogRelevantStatus = '^(?:5|4(?!04))' - SecAuditLogParts = 'ABIJDEFHZ' - SecAuditLogType = 'Serial' + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: - confPath = os.path.join(virtualHostUtilities.Server_root, 'conf/httpd_config.conf') - modSecPath = os.path.join(virtualHostUtilities.Server_root, 'modules', 'mod_security.so') + modsecurity = 0 + SecAuditEngine = 0 + SecRuleEngine = 0 + SecDebugLogLevel = "9" + SecAuditLogRelevantStatus = '^(?:5|4(?!04))' + SecAuditLogParts = 'ABIJDEFHZ' + SecAuditLogType = 'Serial' - if os.path.exists(modSecPath): + confPath = os.path.join(virtualHostUtilities.Server_root, 'conf/httpd_config.conf') + modSecPath = os.path.join(virtualHostUtilities.Server_root, 'modules', 'mod_security.so') + + if os.path.exists(modSecPath): + command = "sudo cat " + confPath + data = subprocess.check_output(shlex.split(command)).splitlines() + + for items in data: + + if items.find('modsecurity ') > -1: + if items.find('on') > -1 or items.find('On') > -1: + modsecurity = 1 + continue + if items.find('SecAuditEngine ') > -1: + if items.find('on') > -1 or items.find('On') > -1: + SecAuditEngine = 1 + continue + + if items.find('SecRuleEngine ') > -1: + if items.find('on') > -1 or items.find('On') > -1: + SecRuleEngine = 1 + continue + + if items.find('SecDebugLogLevel') > -1: + result = items.split(' ') + if result[0] == 'SecDebugLogLevel': + SecDebugLogLevel = result[1] + continue + if items.find('SecAuditLogRelevantStatus') > -1: + result = items.split(' ') + if result[0] == 'SecAuditLogRelevantStatus': + SecAuditLogRelevantStatus = result[1] + continue + if items.find('SecAuditLogParts') > -1: + result = items.split(' ') + if result[0] == 'SecAuditLogParts': + SecAuditLogParts = result[1] + continue + if items.find('SecAuditLogType') > -1: + result = items.split(' ') + if result[0] == 'SecAuditLogType': + SecAuditLogType = result[1] + continue + + final_dic = {'fetchStatus': 1, + 'installed': 1, + 'SecRuleEngine': SecRuleEngine, + 'modsecurity': modsecurity, + 'SecAuditEngine': SecAuditEngine, + 'SecDebugLogLevel': SecDebugLogLevel, + 'SecAuditLogParts': SecAuditLogParts, + 'SecAuditLogRelevantStatus': SecAuditLogRelevantStatus, + 'SecAuditLogType': SecAuditLogType, + } + + else: + final_dic = {'fetchStatus': 1, + 'installed': 0} + else: + SecAuditEngine = 0 + SecRuleEngine = 0 + SecDebugLogLevel = "9" + SecAuditLogRelevantStatus = '^(?:5|4(?!04))' + SecAuditLogParts = 'ABIJDEFHZ' + SecAuditLogType = 'Serial' + + confPath = os.path.join(virtualHostUtilities.Server_root, 'conf/modsec.conf') command = "sudo cat " + confPath data = subprocess.check_output(shlex.split(command)).splitlines() for items in data: - - if items.find('modsecurity ') > -1: - if items.find('on') > -1 or items.find('On') > -1: - modsecurity = 1 - continue if items.find('SecAuditEngine ') > -1: if items.find('on') > -1 or items.find('On') > -1: SecAuditEngine = 1 @@ -759,7 +824,6 @@ class FirewallManager: final_dic = {'fetchStatus': 1, 'installed': 1, 'SecRuleEngine': SecRuleEngine, - 'modsecurity': modsecurity, 'SecAuditEngine': SecAuditEngine, 'SecDebugLogLevel': SecDebugLogLevel, 'SecAuditLogParts': SecAuditLogParts, @@ -767,10 +831,6 @@ class FirewallManager: 'SecAuditLogType': SecAuditLogType, } - else: - final_dic = {'fetchStatus': 1, - 'installed': 0} - final_json = json.dumps(final_dic) return HttpResponse(final_json) @@ -788,68 +848,126 @@ class FirewallManager: else: return ACLManager.loadErrorJson('saveStatus', 0) - modsecurity = data['modsecurity_status'] - SecAuditEngine = data['SecAuditEngine'] - SecRuleEngine = data['SecRuleEngine'] - SecDebugLogLevel = data['SecDebugLogLevel'] - SecAuditLogParts = data['SecAuditLogParts'] - SecAuditLogRelevantStatus = data['SecAuditLogRelevantStatus'] - SecAuditLogType = data['SecAuditLogType'] + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: - if modsecurity == True: - modsecurity = "modsecurity on" + modsecurity = data['modsecurity_status'] + SecAuditEngine = data['SecAuditEngine'] + SecRuleEngine = data['SecRuleEngine'] + SecDebugLogLevel = data['SecDebugLogLevel'] + SecAuditLogParts = data['SecAuditLogParts'] + SecAuditLogRelevantStatus = data['SecAuditLogRelevantStatus'] + SecAuditLogType = data['SecAuditLogType'] + + if modsecurity == True: + modsecurity = "modsecurity on" + else: + modsecurity = "modsecurity off" + + if SecAuditEngine == True: + SecAuditEngine = "SecAuditEngine on" + else: + SecAuditEngine = "SecAuditEngine off" + + if SecRuleEngine == True: + SecRuleEngine = "SecRuleEngine On" + else: + SecRuleEngine = "SecRuleEngine off" + + SecDebugLogLevel = "SecDebugLogLevel " + str(SecDebugLogLevel) + SecAuditLogParts = "SecAuditLogParts " + str(SecAuditLogParts) + SecAuditLogRelevantStatus = "SecAuditLogRelevantStatus " + SecAuditLogRelevantStatus + SecAuditLogType = "SecAuditLogType " + SecAuditLogType + + ## writing data temporary to file + + + tempConfigPath = "/home/cyberpanel/" + str(randint(1000, 9999)) + + confPath = open(tempConfigPath, "w") + + confPath.writelines(modsecurity + "\n") + confPath.writelines(SecAuditEngine + "\n") + confPath.writelines(SecRuleEngine + "\n") + confPath.writelines(SecDebugLogLevel + "\n") + confPath.writelines(SecAuditLogParts + "\n") + confPath.writelines(SecAuditLogRelevantStatus + "\n") + confPath.writelines(SecAuditLogType + "\n") + + confPath.close() + + ## save configuration data + + execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" + + execPath = execPath + " saveModSecConfigs --tempConfigPath " + tempConfigPath + + output = subprocess.check_output(shlex.split(execPath)) + + if output.find("1,None") > -1: + installUtilities.reStartLiteSpeed() + data_ret = {'saveStatus': 1, 'error_message': "None"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + else: + data_ret = {'saveStatus': 0, 'error_message': output} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) else: - modsecurity = "modsecurity off" + SecAuditEngine = data['SecAuditEngine'] + SecRuleEngine = data['SecRuleEngine'] + SecDebugLogLevel = data['SecDebugLogLevel'] + SecAuditLogParts = data['SecAuditLogParts'] + SecAuditLogRelevantStatus = data['SecAuditLogRelevantStatus'] + SecAuditLogType = data['SecAuditLogType'] - if SecAuditEngine == True: - SecAuditEngine = "SecAuditEngine on" - else: - SecAuditEngine = "SecAuditEngine off" + if SecAuditEngine == True: + SecAuditEngine = "SecAuditEngine on" + else: + SecAuditEngine = "SecAuditEngine off" - if SecRuleEngine == True: - SecRuleEngine = "SecRuleEngine On" - else: - SecRuleEngine = "SecRuleEngine off" + if SecRuleEngine == True: + SecRuleEngine = "SecRuleEngine On" + else: + SecRuleEngine = "SecRuleEngine off" - SecDebugLogLevel = "SecDebugLogLevel " + str(SecDebugLogLevel) - SecAuditLogParts = "SecAuditLogParts " + str(SecAuditLogParts) - SecAuditLogRelevantStatus = "SecAuditLogRelevantStatus " + SecAuditLogRelevantStatus - SecAuditLogType = "SecAuditLogType " + SecAuditLogType + SecDebugLogLevel = "SecDebugLogLevel " + str(SecDebugLogLevel) + SecAuditLogParts = "SecAuditLogParts " + str(SecAuditLogParts) + SecAuditLogRelevantStatus = "SecAuditLogRelevantStatus " + SecAuditLogRelevantStatus + SecAuditLogType = "SecAuditLogType " + SecAuditLogType - ## writing data temporary to file + ## writing data temporary to file - tempConfigPath = "/home/cyberpanel/" + str(randint(1000, 9999)) + tempConfigPath = "/home/cyberpanel/" + str(randint(1000, 9999)) - confPath = open(tempConfigPath, "w") + confPath = open(tempConfigPath, "w") - confPath.writelines(modsecurity + "\n") - confPath.writelines(SecAuditEngine + "\n") - confPath.writelines(SecRuleEngine + "\n") - confPath.writelines(SecDebugLogLevel + "\n") - confPath.writelines(SecAuditLogParts + "\n") - confPath.writelines(SecAuditLogRelevantStatus + "\n") - confPath.writelines(SecAuditLogType + "\n") + confPath.writelines(SecAuditEngine + "\n") + confPath.writelines(SecRuleEngine + "\n") + confPath.writelines(SecDebugLogLevel + "\n") + confPath.writelines(SecAuditLogParts + "\n") + confPath.writelines(SecAuditLogRelevantStatus + "\n") + confPath.writelines(SecAuditLogType + "\n") - confPath.close() + confPath.close() - ## save configuration data + ## save configuration data - execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" + execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" - execPath = execPath + " saveModSecConfigs --tempConfigPath " + tempConfigPath + execPath = execPath + " saveModSecConfigs --tempConfigPath " + tempConfigPath - output = subprocess.check_output(shlex.split(execPath)) + output = subprocess.check_output(shlex.split(execPath)) - if output.find("1,None") > -1: - installUtilities.reStartLiteSpeed() - data_ret = {'saveStatus': 1, 'error_message': "None"} - json_data = json.dumps(data_ret) - return HttpResponse(json_data) - else: - data_ret = {'saveStatus': 0, 'error_message': output} - json_data = json.dumps(data_ret) - return HttpResponse(json_data) + if output.find("1,None") > -1: + installUtilities.reStartLiteSpeed() + data_ret = {'saveStatus': 1, 'error_message': "None"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + else: + data_ret = {'saveStatus': 0, 'error_message': output} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) except BaseException, msg: data_ret = {'saveStatus': 0, 'error_message': str(msg)} @@ -866,17 +984,20 @@ class FirewallManager: else: return ACLManager.loadError() - confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") - command = "sudo cat " + confPath - httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + command = "sudo cat " + confPath + httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() - modSecInstalled = 0 + modSecInstalled = 0 - for items in httpdConfig: - if items.find('module mod_security') > -1: - modSecInstalled = 1 - break + for items in httpdConfig: + if items.find('module mod_security') > -1: + modSecInstalled = 1 + break + else: + modSecInstalled = 1 return render(request, 'firewall/modSecurityRules.html', {'modSecInstalled': modSecInstalled}) @@ -892,21 +1013,39 @@ class FirewallManager: else: return ACLManager.loadErrorJson('modSecInstalled', 0) - confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: - command = "sudo cat " + confPath - httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") - modSecInstalled = 0 + command = "sudo cat " + confPath + httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() - for items in httpdConfig: - if items.find('module mod_security') > -1: - modSecInstalled = 1 - break + modSecInstalled = 0 - rulesPath = os.path.join(virtualHostUtilities.Server_root + "/conf/modsec/rules.conf") + for items in httpdConfig: + if items.find('module mod_security') > -1: + modSecInstalled = 1 + break + + rulesPath = os.path.join(virtualHostUtilities.Server_root + "/conf/modsec/rules.conf") + + if modSecInstalled: + command = "sudo cat " + rulesPath + currentModSecRules = subprocess.check_output(shlex.split(command)) + + final_dic = {'modSecInstalled': 1, + 'currentModSecRules': currentModSecRules} + + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + else: + final_dic = {'modSecInstalled': 0} + + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + else: + rulesPath = os.path.join(virtualHostUtilities.Server_root + "/conf/rules.conf") - if modSecInstalled: command = "sudo cat " + rulesPath currentModSecRules = subprocess.check_output(shlex.split(command)) @@ -915,11 +1054,6 @@ class FirewallManager: final_json = json.dumps(final_dic) return HttpResponse(final_json) - else: - final_dic = {'modSecInstalled': 0} - - final_json = json.dumps(final_dic) - return HttpResponse(final_json) except BaseException, msg: final_dic = {'modSecInstalled': 0, @@ -941,17 +1075,13 @@ class FirewallManager: ## writing data temporary to file rulesPath = open(modSec.tempRulesFile, "w") - rulesPath.write(newModSecRules) - rulesPath.close() ## save configuration data execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" - execPath = execPath + " saveModSecRules" - output = subprocess.check_output(shlex.split(execPath)) if output.find("1,None") > -1: @@ -979,17 +1109,21 @@ class FirewallManager: else: return ACLManager.loadError() - confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: - command = "sudo cat " + confPath - httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") - modSecInstalled = 0 + command = "sudo cat " + confPath + httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() - for items in httpdConfig: - if items.find('module mod_security') > -1: - modSecInstalled = 1 - break + modSecInstalled = 0 + + for items in httpdConfig: + if items.find('module mod_security') > -1: + modSecInstalled = 1 + break + else: + modSecInstalled = 1 return render(request, 'firewall/modSecurityRulesPacks.html', {'modSecInstalled': modSecInstalled}) @@ -1006,47 +1140,70 @@ class FirewallManager: else: return ACLManager.loadErrorJson('modSecInstalled', 0) - confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") - command = "sudo cat " + confPath - httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() - - modSecInstalled = 0 - - for items in httpdConfig: - if items.find('module mod_security') > -1: - modSecInstalled = 1 - break - - comodoInstalled = 0 - owaspInstalled = 0 - - if modSecInstalled: command = "sudo cat " + confPath httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + modSecInstalled = 0 + for items in httpdConfig: - - if items.find('modsec/comodo') > -1: - comodoInstalled = 1 - elif items.find('modsec/owasp') > -1: - owaspInstalled = 1 - - if owaspInstalled == 1 and comodoInstalled == 1: + if items.find('module mod_security') > -1: + modSecInstalled = 1 break + comodoInstalled = 0 + owaspInstalled = 0 + + if modSecInstalled: + command = "sudo cat " + confPath + httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + + for items in httpdConfig: + + if items.find('modsec/comodo') > -1: + comodoInstalled = 1 + elif items.find('modsec/owasp') > -1: + owaspInstalled = 1 + + if owaspInstalled == 1 and comodoInstalled == 1: + break + + final_dic = { + 'modSecInstalled': 1, + 'owaspInstalled': owaspInstalled, + 'comodoInstalled': comodoInstalled + } + + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + else: + final_dic = {'modSecInstalled': 0} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + + else: + comodoInstalled = 0 + owaspInstalled = 0 + + try: + command = 'sudo cat /usr/local/lsws/conf/comodo_litespeed/rules.conf.main' + res = subprocess.call(shlex.split(command)) + + if res == 0: + comodoInstalled = 1 + except subprocess.CalledProcessError: + pass + final_dic = { 'modSecInstalled': 1, 'owaspInstalled': owaspInstalled, 'comodoInstalled': comodoInstalled } + final_json = json.dumps(final_dic) + return HttpResponse(final_json) - final_json = json.dumps(final_dic) - return HttpResponse(final_json) - else: - final_dic = {'modSecInstalled': 0} - final_json = json.dumps(final_dic) - return HttpResponse(final_json) except BaseException, msg: final_dic = {'modSecInstalled': 0, 'error_message': str(msg)} final_json = json.dumps(final_dic) @@ -1064,21 +1221,40 @@ class FirewallManager: packName = data['packName'] - execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: - execPath = execPath + " " + packName + execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" + execPath = execPath + " " + packName - output = subprocess.check_output(shlex.split(execPath)) + output = subprocess.check_output(shlex.split(execPath)) - if output.find("1,None") > -1: - installUtilities.reStartLiteSpeed() - data_ret = {'installStatus': 1, 'error_message': "None"} - json_data = json.dumps(data_ret) - return HttpResponse(json_data) + if output.find("1,None") > -1: + installUtilities.reStartLiteSpeed() + data_ret = {'installStatus': 1, 'error_message': "None"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + else: + data_ret = {'installStatus': 0, 'error_message': output} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) else: - data_ret = {'installStatus': 0, 'error_message': output} - json_data = json.dumps(data_ret) - return HttpResponse(json_data) + if packName == 'disableOWASP' or packName == 'installOWASP': + final_json = json.dumps({'installStatus': 0, 'error_message': "OWASP will be available later.", }) + return HttpResponse(final_json) + + execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/modSec.py" + execPath = execPath + " " + packName + output = subprocess.check_output(shlex.split(execPath)) + + if output.find("1,None") > -1: + installUtilities.reStartLiteSpeed() + data_ret = {'installStatus': 1, 'error_message': "None"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + else: + data_ret = {'installStatus': 0, 'error_message': output} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) except BaseException, msg: data_ret = {'installStatus': 0, 'error_message': str(msg)} @@ -1096,26 +1272,70 @@ class FirewallManager: packName = data['packName'] - confPath = os.path.join(virtualHostUtilities.Server_root, 'conf/httpd_config.conf') + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + confPath = os.path.join(virtualHostUtilities.Server_root, 'conf/httpd_config.conf') - command = "sudo cat " + confPath - httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() + command = "sudo cat " + confPath + httpdConfig = subprocess.check_output(shlex.split(command)).splitlines() - json_data = "[" - checker = 0 - counter = 0 + json_data = "[" + checker = 0 + counter = 0 - for items in httpdConfig: + for items in httpdConfig: - if items.find('modsec/' + packName) > -1: - counter = counter + 1 - if items[0] == '#': - status = False + if items.find('modsec/' + packName) > -1: + counter = counter + 1 + if items[0] == '#': + status = False + else: + status = True + + fileName = items.lstrip('#') + fileName = fileName.split('/')[-1] + + dic = { + 'id': counter, + 'fileName': fileName, + 'packName': packName, + 'status': status, + + } + + if checker == 0: + json_data = json_data + json.dumps(dic) + checker = 1 + else: + json_data = json_data + ',' + json.dumps(dic) + + json_data = json_data + ']' + final_json = json.dumps({'fetchStatus': 1, 'error_message': "None", "data": json_data}) + return HttpResponse(final_json) + else: + if packName == 'owasp': + final_json = json.dumps({'fetchStatus': 0, 'error_message': "OWASP will be available later.", }) + return HttpResponse(final_json) + + comodoPath = '/usr/local/lsws/conf/comodo_litespeed' + command = 'sudo chown -R cyberpanel:cyberpanel /usr/local/lsws/conf' + subprocess.call(shlex.split(command)) + + json_data = "[" + + counter = 0 + checker = 0 + for fileName in os.listdir(comodoPath): + + if fileName == 'categories.conf': + continue + + if fileName.endswith('dis'): + status = 0 + fileName = fileName.rstrip('.dis') + elif fileName.endswith('conf'): + status = 1 else: - status = True - - fileName = items.lstrip('#') - fileName = fileName.split('/')[-1] + continue dic = { 'id': counter, @@ -1125,15 +1345,20 @@ class FirewallManager: } + counter = counter + 1 + if checker == 0: json_data = json_data + json.dumps(dic) checker = 1 else: json_data = json_data + ',' + json.dumps(dic) - json_data = json_data + ']' - final_json = json.dumps({'fetchStatus': 1, 'error_message': "None", "data": json_data}) - return HttpResponse(final_json) + command = 'sudo chown -R lsadm:lsadm /usr/local/lsws/conf' + subprocess.call(shlex.split(command)) + + json_data = json_data + ']' + final_json = json.dumps({'fetchStatus': 1, 'error_message': "None", "data": json_data}) + return HttpResponse(final_json) except BaseException, msg: final_dic = {'fetchStatus': 0, 'error_message': str(msg)} diff --git a/firewall/static/firewall/firewall.js b/firewall/static/firewall/firewall.js index ba9df9207..bb0e4a07f 100644 --- a/firewall/static/firewall/firewall.js +++ b/firewall/static/firewall/firewall.js @@ -3,10 +3,6 @@ */ - - - - /* Java script code to ADD Firewall Rules */ app.controller('firewallController', function($scope,$http) { @@ -548,8 +544,6 @@ app.controller('firewallController', function($scope,$http) { /* Java script code to ADD Firewall Rules */ - - /* Java script code to Secure SSH */ app.controller('secureSSHCTRL', function($scope,$http) { diff --git a/firewall/templates/firewall/modSecurity.html b/firewall/templates/firewall/modSecurity.html index e0476e917..768caa26e 100644 --- a/firewall/templates/firewall/modSecurity.html +++ b/firewall/templates/firewall/modSecurity.html @@ -3,189 +3,396 @@ {% block title %}{% trans "ModSecurity - CyberPanel" %}{% endblock %} {% block content %} -{% load static %} -{% get_current_language as LANGUAGE_CODE %} - + {% load static %} + {% get_current_language as LANGUAGE_CODE %} + + {% if OLS %} -
-
-

{% trans "ModSecurity Configurations!" %} - {% trans "ModSec Docs" %}

-

{% trans "On this page you can configure ModSecurity settings." %}

-
+
+
+

{% trans "ModSecurity Configurations!" %} - {% trans "ModSec Docs" %} +

+

{% trans "On this page you can configure ModSecurity settings." %}

+
-
-
-

- {% trans "ModSecurity" %} -

+
+
+

+ {% trans "ModSecurity" %} +

-
-
+
+
- {% if modSecInstalled == 0 %} + {% if modSecInstalled == 0 %} -
-

{% trans "ModSecurity is not installed " %} -

-
- - - -
- -
- -
-

{% trans "Failed to start installation, Error message: " %} {$ errorMessage $}

+
+

{% trans "ModSecurity is not installed " %} + +

-
-

{% trans "Could not connect. Please refresh this page." %}

-
+ -
-

{% trans "Installation failed." %} {$ errorMessage $}

-
+
+ +
-
-

{% trans "ModSecurity successfully installed, refreshing page in 3 seconds.." %}

-
-
-
+
+

{% trans "Failed to start installation, Error message: " %} {$ + errorMessage + $}

+
- -
- -
-
-
-

{% trans "Winter is coming, but so is ModSecurity." %}

-
-
- -
-
-
-
- - - - {% else %} - -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
{$ SecDebugLogLevel $}
-
-
- -
- -
- -
-
- - -
- -
- -
-
- -
- -
- -
-
- - - -
- -
- - -
-
- - - -
- -
- -
-

{% trans "Failed to save ModSecurity configurations. Error message: " %} {$ errorMessage $}

-
- -
-

{% trans "ModSecurity configurations successfully saved." %}

-
- -
+

{% trans "Could not connect. Please refresh this page." %}

+
+ +
+

{% trans "Installation failed." %} {$ errorMessage $}

+
+ +
+

{% trans "ModSecurity successfully installed, refreshing page in 3 seconds.." %}

+
+
+ + +
+ + +
+
+

{% trans "Winter is coming, but so is ModSecurity." %} +

+
+
+ +
+
+ +
+ + + + {% else %} + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
{$ SecDebugLogLevel $}
+
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ +
+

{% trans "Failed to save ModSecurity configurations. Error message: " %} + {$ errorMessage $}

+
+ +
+

{% trans "ModSecurity configurations successfully saved." %}

+
+ +
+

{% trans "Could not connect. Please refresh this page." %}

+
+ +
+
+ + +
+
+ + {% endif %} + -
- - - -
- - {% endif %} - - - +
+ +
-
+ + {% else %} + +
+
+

{% trans "ModSecurity Configurations!" %} - {% trans "ModSec Docs" %} +

+

{% trans "On this page you can configure ModSecurity settings." %}

+
+ +
+
+

+ {% trans "ModSecurity" %} +

+ +
+
+ + {% if modSecInstalled == 0 %} + +
+

{% trans "ModSecurity is not installed " %} + +

+
+ + + +
+ +
+ +
+

{% trans "Failed to start installation, Error message: " %} {$ + errorMessage $}

+
+ +
+

{% trans "Could not connect. Please refresh this page." %}

+
+ +
+

{% trans "Installation failed." %} {$ errorMessage $}

+
+ +
+

{% trans "ModSecurity successfully installed, refreshing page in 3 seconds.." %}

+
+
+
-
+
+ +
+
+
+

{% trans "Winter is coming, but so is ModSecurity." %} +

+
+
+ +
+
+
+
+ + + + {% else %} + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
{$ SecDebugLogLevel $}
+
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ +
+

{% trans "Failed to save ModSecurity configurations. Error message: " %} + {$ errorMessage $}

+
+ +
+

{% trans "ModSecurity configurations successfully saved." %}

+
+ +
+

{% trans "Could not connect. Please refresh this page." %}

+
+ +
+
+ + +
+
+ + {% endif %} + + +
+
+
+
+ + +
+ + {% endif %} {% endblock %} \ No newline at end of file diff --git a/ftp/ftpManager.py b/ftp/ftpManager.py index e7ce81ef5..8dc4b85f4 100644 --- a/ftp/ftpManager.py +++ b/ftp/ftpManager.py @@ -79,12 +79,9 @@ class FTPManager: path = 'None' execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/ftpUtilities.py" - execPath = execPath + " submitFTPCreation --domainName " + domainName + " --userName " + userName \ + " --password " + password + " --path " + path + " --owner " + admin.userName + ' --api ' + api - output = subprocess.check_output(shlex.split(execPath)) - if output.find("1,None") > -1: data_ret = {'status': 1, 'creatFTPStatus': 1, 'error_message': 'None'} json_data = json.dumps(data_ret) diff --git a/install/install.py b/install/install.py index 923701a88..48d37e65a 100644 --- a/install/install.py +++ b/install/install.py @@ -296,24 +296,26 @@ class preFlightsChecks: preFlightsChecks.stdOut("Exception during CyberPanel install") os._exit(os.EX_SOFTWARE) - else: - while(1): - cmd.append("rpm") - cmd.append("-ivh") - cmd.append("http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el7.noarch.rpm") - res = subprocess.call(cmd) + else: + while (1): + cmd.append("rpm") + cmd.append("-ivh") + cmd.append("http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el7.noarch.rpm") + res = subprocess.call(cmd) - if res == 1: - count = count + 1 - preFlightsChecks.stdOut("Unable to add CyberPanel official repository, trying again, try number: " + str(count) + "\n") - if count == 3: - logging.InstallLog.writeToFile("Unable to add CyberPanel official repository, exiting installer! [installCyberPanelRepo]") - preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt") - os._exit(0) - else: - logging.InstallLog.writeToFile("CyberPanel Repo added!") - preFlightsChecks.stdOut("CyberPanel Repo added!") - break + if res == 1: + count = count + 1 + preFlightsChecks.stdOut( + "Unable to add CyberPanel official repository, trying again, try number: " + str(count) + "\n") + if count == 3: + logging.InstallLog.writeToFile( + "Unable to add CyberPanel official repository, exiting installer! [installCyberPanelRepo]") + preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt") + os._exit(0) + else: + logging.InstallLog.writeToFile("CyberPanel Repo added!") + preFlightsChecks.stdOut("CyberPanel Repo added!") + break def enableEPELRepo(self): try: diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index 4942079ef..d591262cd 100644 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -234,7 +234,6 @@ class InstallCyberPanel: 'lsphp7?-ldap lsphp7?-mysql lsphp7?-opcache lsphp7?-pspell lsphp7?-recode ' \ 'lsphp7?-sqlite3 lsphp7?-tidy' res = os.system(command) - else: command = 'yum -y groupinstall lsphp-all' cmd = shlex.split(command) diff --git a/plogical/CyberCPLogFileWriter.py b/plogical/CyberCPLogFileWriter.py index dc2d11890..2ff68a41d 100644 --- a/plogical/CyberCPLogFileWriter.py +++ b/plogical/CyberCPLogFileWriter.py @@ -41,7 +41,7 @@ class CyberCPLogFileWriter: @staticmethod def statusWriter(tempStatusPath, mesg): try: - statusFile = open(tempStatusPath, 'w') + statusFile = open(tempStatusPath, 'a') statusFile.writelines(mesg) statusFile.close() except BaseException, msg: diff --git a/plogical/filemanager.py b/plogical/filemanager.py index 2c95c8ca8..69faec37a 100644 --- a/plogical/filemanager.py +++ b/plogical/filemanager.py @@ -1,12 +1,7 @@ -import os.path -import shutil import CyberCPLogFileWriter as logging -import subprocess import argparse -import shlex from random import randint - class filemanager: @staticmethod @@ -25,7 +20,7 @@ class filemanager: except BaseException,msg: logging.CyberCPLogFileWriter.writeToFile( - str(msg) + " [createEmailAccount]") + str(msg) + " [createTemporaryFile]") print "0," + str(msg) diff --git a/plogical/installUtilities.py b/plogical/installUtilities.py index 7b697e50d..dfbf42fd1 100644 --- a/plogical/installUtilities.py +++ b/plogical/installUtilities.py @@ -4,8 +4,8 @@ import CyberCPLogFileWriter as logging import shutil import pexpect import os -import thread import shlex +from processUtilities import ProcessUtilities class installUtilities: @@ -136,15 +136,15 @@ class installUtilities: @staticmethod def reStartLiteSpeed(): try: - FNULL = open(os.devnull, 'w') - command = "sudo systemctl restart lsws" + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + command = "sudo systemctl restart lsws" + else: + command = "sudo /usr/local/lsws/bin/lswsctrl restart" cmd = shlex.split(command) - - res = subprocess.call(cmd, stdout=FNULL, stderr=subprocess.STDOUT) - + subprocess.call(cmd, stdout=FNULL, stderr=subprocess.STDOUT) except OSError, msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [reStartLiteSpeed]") @@ -159,12 +159,12 @@ class installUtilities: def reStartOpenLiteSpeed(restart,orestart): try: - FNULL = open(os.devnull, 'w') - - command = "sudo systemctl restart lsws" + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + command = "sudo systemctl restart lsws" + else: + command = "sudo /usr/local/lsws/bin/lswsctrl restart" cmd = shlex.split(command) - res = subprocess.call(cmd) if res == 1: @@ -177,7 +177,6 @@ class installUtilities: print(" Litespeed Re-Started ") print("###############################################") - except OSError, msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [reStartOpenLiteSpeed]") return 0 @@ -279,8 +278,6 @@ class installUtilities: return 1 - - @staticmethod def installMainWebServer(): if installUtilities.enableEPELRepo() == 1: @@ -370,7 +367,6 @@ class installUtilities: return 1 - @staticmethod def startMariaDB(): @@ -406,7 +402,6 @@ class installUtilities: return 1 - @staticmethod def installMySQL(password): diff --git a/plogical/modSec.py b/plogical/modSec.py index efcfae27b..60ec1f8bf 100644 --- a/plogical/modSec.py +++ b/plogical/modSec.py @@ -7,6 +7,7 @@ import os import tarfile import shutil from mailUtilities import mailUtilities +from processUtilities import ProcessUtilities class modSec: installLogPath = "/home/cyberpanel/modSecInstallLog" @@ -111,42 +112,74 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf data = open(tempConfigPath).readlines() os.remove(tempConfigPath) - confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: - confData = open(confFile).readlines() + confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + confData = open(confFile).readlines() + conf = open(confFile, 'w') - conf = open(confFile, 'w') + for items in confData: - for items in confData: + if items.find('modsecurity ') > -1: + conf.writelines(data[0]) + continue + elif items.find('SecAuditEngine ') > -1: + conf.writelines(data[1]) + continue + elif items.find('SecRuleEngine ') > -1: + conf.writelines(data[2]) + continue + elif items.find('SecDebugLogLevel') > -1: + conf.writelines(data[3]) + continue + elif items.find('SecAuditLogRelevantStatus ') > -1: + conf.writelines(data[5]) + continue + elif items.find('SecAuditLogParts ') > -1: + conf.writelines(data[4]) + continue + elif items.find('SecAuditLogType ') > -1: + conf.writelines(data[6]) + continue + else: + conf.writelines(items) - if items.find('modsecurity ') > -1: - conf.writelines(data[0]) - continue - elif items.find('SecAuditEngine ') > -1: - conf.writelines(data[1]) - continue - elif items.find('SecRuleEngine ') > -1: - conf.writelines(data[2]) - continue - elif items.find('SecDebugLogLevel') > -1: - conf.writelines(data[3]) - continue - elif items.find('SecAuditLogRelevantStatus ') > -1: - conf.writelines(data[5]) - continue - elif items.find('SecAuditLogParts ') > -1: - conf.writelines(data[4]) - continue - elif items.find('SecAuditLogType ') > -1: - conf.writelines(data[6]) - continue - else: - conf.writelines(items) + conf.close() - conf.close() + print "1,None" + return + else: + confFile = os.path.join(virtualHostUtilities.Server_root, "conf/modsec.conf") + confData = open(confFile).readlines() + conf = open(confFile, 'w') - print "1,None" - return + for items in confData: + + if items.find('SecAuditEngine ') > -1: + conf.writelines(data[0]) + continue + elif items.find('SecRuleEngine ') > -1: + conf.writelines(data[1]) + continue + elif items.find('SecDebugLogLevel') > -1: + conf.writelines(data[2]) + continue + elif items.find('SecAuditLogRelevantStatus ') > -1: + conf.writelines(data[4]) + continue + elif items.find('SecAuditLogParts ') > -1: + conf.writelines(data[3]) + continue + elif items.find('SecAuditLogType ') > -1: + conf.writelines(data[5]) + continue + else: + conf.writelines(items) + + conf.close() + + print "1,None" + return except BaseException, msg: logging.CyberCPLogFileWriter.writeToFile( @@ -160,7 +193,10 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf data = rulesFile.read() rulesFile.close() - rulesFilePath = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/rules.conf") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + rulesFilePath = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/rules.conf") + else: + rulesFilePath = os.path.join(virtualHostUtilities.Server_root, "conf/rules.conf") rulesFile = open(rulesFilePath,'w') rulesFile.write(data) @@ -180,26 +216,47 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf @staticmethod def setupComodoRules(): try: - pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/comodo") - extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf/modsec") - if os.path.exists(pathTOOWASPFolder): - shutil.rmtree(pathTOOWASPFolder) + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/comodo") + extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf/modsec") - if os.path.exists('comodo.tar.gz'): - os.remove('comodo.tar.gz') + if os.path.exists(pathTOOWASPFolder): + shutil.rmtree(pathTOOWASPFolder) - command = "wget https://" + modSec.mirrorPath + "/modsec/comodo.tar.gz" - result = subprocess.call(shlex.split(command)) + if os.path.exists('comodo.tar.gz'): + os.remove('comodo.tar.gz') - if result == 1: - return 0 + command = "wget https://" + modSec.mirrorPath + "/modsec/comodo.tar.gz" + result = subprocess.call(shlex.split(command)) - tar = tarfile.open('comodo.tar.gz') - tar.extractall(extractLocation) - tar.close() + if result == 1: + return 0 - return 1 + tar = tarfile.open('comodo.tar.gz') + tar.extractall(extractLocation) + tar.close() + + return 1 + else: + if os.path.exists('/usr/local/lsws/conf/comodo_litespeed'): + shutil.rmtree('/usr/local/lsws/conf/comodo_litespeed') + + extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf") + + if os.path.exists('cpanel_litespeed_vendor'): + os.remove('cpanel_litespeed_vendor') + + command = "wget https://waf.comodo.com/api/cpanel_litespeed_vendor" + result = subprocess.call(shlex.split(command)) + + if result == 1: + return 0 + + command = "unzip cpanel_litespeed_vendor -d " + extractLocation + subprocess.call(shlex.split(command)) + + return 1 except BaseException, msg: logging.CyberCPLogFileWriter.writeToFile( @@ -209,60 +266,85 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf @staticmethod def installComodo(): try: - if modSec.setupComodoRules() == 0: - print '0, Unable to download Comodo Rules.' + + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + if modSec.setupComodoRules() == 0: + print '0, Unable to download Comodo Rules.' + return + + owaspRulesConf = """modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/modsecurity.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/00_Init_Initialization.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/01_Init_AppsInitialization.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/02_Global_Generic.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/03_Global_Agents.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/04_Global_Domains.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/05_Global_Backdoor.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/06_XSS_XSS.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/07_Global_Other.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/08_Bruteforce_Bruteforce.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/09_HTTP_HTTP.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/10_HTTP_HTTPDoS.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/11_HTTP_Protocol.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/12_HTTP_Request.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/13_Outgoing_FilterGen.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/14_Outgoing_FilterASP.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/15_Outgoing_FilterPHP.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/16_Outgoing_FilterSQL.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/17_Outgoing_FilterOther.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/18_Outgoing_FilterInFrame.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/19_Outgoing_FiltersEnd.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/20_PHP_PHPGen.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/21_SQL_SQLi.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/22_Apps_Joomla.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/23_Apps_JComponent.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/24_Apps_WordPress.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/25_Apps_WPPlugin.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/26_Apps_WHMCS.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/27_Apps_Drupal.conf + modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/28_Apps_OtherApps.conf + """ + + confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + + confData = open(confFile).readlines() + + conf = open(confFile, 'w') + + for items in confData: + if items.find('/usr/local/lsws/conf/modsec/rules.conf') > -1: + conf.writelines(items) + conf.write(owaspRulesConf) + continue + else: + conf.writelines(items) + + conf.close() + + print "1,None" return + else: + if os.path.exists('/usr/local/lsws/conf/comodo_litespeed'): + shutil.rmtree('/usr/local/lsws/conf/comodo_litespeed') - owaspRulesConf = """modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/modsecurity.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/00_Init_Initialization.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/01_Init_AppsInitialization.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/02_Global_Generic.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/03_Global_Agents.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/04_Global_Domains.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/05_Global_Backdoor.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/06_XSS_XSS.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/07_Global_Other.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/08_Bruteforce_Bruteforce.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/09_HTTP_HTTP.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/10_HTTP_HTTPDoS.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/11_HTTP_Protocol.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/12_HTTP_Request.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/13_Outgoing_FilterGen.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/14_Outgoing_FilterASP.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/15_Outgoing_FilterPHP.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/16_Outgoing_FilterSQL.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/17_Outgoing_FilterOther.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/18_Outgoing_FilterInFrame.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/19_Outgoing_FiltersEnd.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/20_PHP_PHPGen.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/21_SQL_SQLi.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/22_Apps_Joomla.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/23_Apps_JComponent.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/24_Apps_WordPress.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/25_Apps_WPPlugin.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/26_Apps_WHMCS.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/27_Apps_Drupal.conf -modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/28_Apps_OtherApps.conf -""" + extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf") - confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + if os.path.exists('cpanel_litespeed_vendor'): + os.remove('cpanel_litespeed_vendor') - confData = open(confFile).readlines() + command = "wget https://waf.comodo.com/api/cpanel_litespeed_vendor" + result = subprocess.call(shlex.split(command)) - conf = open(confFile, 'w') + if result == 1: + return 0 - for items in confData: - if items.find('/usr/local/lsws/conf/modsec/rules.conf') > -1: - conf.writelines(items) - conf.write(owaspRulesConf) - continue - else: - conf.writelines(items) + command = "unzip cpanel_litespeed_vendor -d " + extractLocation + result = subprocess.call(shlex.split(command)) - conf.close() + command = 'sudo chown -R lsadm:lsadm /usr/local/lsws/conf' + subprocess.call(shlex.split(command)) - print "1,None" - return + print "1,None" + return except BaseException, msg: logging.CyberCPLogFileWriter.writeToFile( @@ -273,19 +355,28 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/comodo/28_Apps_OtherApps.conf def disableComodo(): try: - confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") - confData = open(confFile).readlines() - conf = open(confFile, 'w') + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + confFile = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf") + confData = open(confFile).readlines() + conf = open(confFile, 'w') - for items in confData: - if items.find('modsec/comodo') > -1: - continue - else: - conf.writelines(items) + for items in confData: + if items.find('modsec/comodo') > -1: + continue + else: + conf.writelines(items) - conf.close() + conf.close() + + print "1,None" + + else: + try: + shutil.rmtree('/usr/local/lsws/conf/comodo_litespeed') + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + ' [disableComodo]') + print "1,None" - print "1,None" except BaseException, msg: logging.CyberCPLogFileWriter.writeToFile( diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py index a87264190..e86a1b081 100644 --- a/plogical/processUtilities.py +++ b/plogical/processUtilities.py @@ -1,11 +1,15 @@ from CyberCPLogFileWriter import CyberCPLogFileWriter as logging import subprocess import shlex - - +import os +from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging class ProcessUtilities: litespeedProcess = "litespeed" + ent = 1 + OLS = 0 + centos = 1 + ubuntu = 0 @staticmethod def getLitespeedProcessNumber(): @@ -14,7 +18,7 @@ class ProcessUtilities: try: import psutil for proc in psutil.process_iter(): - if proc.name() == ProcessUtilities.litespeedProcess: + if proc.name().find(ProcessUtilities.litespeedProcess) > -1: finalListOfProcesses.append(proc.pid) except BaseException,msg: @@ -30,7 +34,11 @@ class ProcessUtilities: @staticmethod def restartLitespeed(): try: - command = "sudo systemctl restart lsws" + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + command = "sudo systemctl restart lsws" + else: + command = "sudo /usr/local/lsws/bin/lswsctrl restart" + cmd = shlex.split(command) res = subprocess.call(cmd) @@ -45,7 +53,11 @@ class ProcessUtilities: @staticmethod def stopLitespeed(): try: - command = "sudo systemctl stop lsws" + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + command = "sudo systemctl stop lsws" + else: + command = "sudo /usr/local/lsws/bin/lswsctrl stop" + cmd = shlex.split(command) res = subprocess.call(cmd) @@ -57,4 +69,58 @@ class ProcessUtilities: except subprocess.CalledProcessError, msg: logging.writeToFile(str(msg) + "[stopLitespeed]") + @staticmethod + def executioner(command): + try: + res = subprocess.call(shlex.split(command)) + if res == 1: + raise 0 + else: + return 1 + except BaseException, msg: + return 0 + + @staticmethod + def killLiteSpeed(): + pids = ProcessUtilities.getLitespeedProcessNumber() + if pids !=0: + for items in pids: + try: + command = 'sudo kill -9 ' + str(items) + ProcessUtilities.executioner(command) + except: + pass + + @staticmethod + def decideServer(): + entPath = '/usr/local/lsws/bin/lshttpd' + + if os.readlink(entPath) == '/usr/local/lsws/bin/lshttpd/openlitespeed': + return ProcessUtilities.OLS + else: + return ProcessUtilities.ent + + @staticmethod + def decideDistro(): + distroPath = '/etc/lsb-release' + + if os.path.exists(distroPath): + return ProcessUtilities.ubuntu + else: + return ProcessUtilities.centos + + @staticmethod + def executioner(command, statusFile): + try: + res = subprocess.call(shlex.split(command), stdout=statusFile, stderr=statusFile) + if res == 1: + raise 0 + else: + return 1 + + except BaseException, msg: + logging.writeToFile(str(msg)) + return 0 + + diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py index 13b66b51f..687a3432c 100644 --- a/plogical/sslUtilities.py +++ b/plogical/sslUtilities.py @@ -1,9 +1,10 @@ import CyberCPLogFileWriter as logging -import shutil import os import shlex import subprocess import socket +from plogical.processUtilities import ProcessUtilities +from websiteFunctions.models import ChildDomains, Websites class sslUtilities: @@ -58,109 +59,189 @@ class sslUtilities: return [0, "347 " + str(msg) + " [issueSSLForDomain]"] @staticmethod - def installSSLForDomain(virtualHostName): + def installSSLForDomain(virtualHostName, adminEmail='usman@cyberpersons.com'): + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + confPath = sslUtilities.Server_root + "/conf/vhosts/" + virtualHostName + completePathToConfigFile = confPath + "/vhost.conf" - confPath = sslUtilities.Server_root + "/conf/vhosts/" + virtualHostName - completePathToConfigFile = confPath + "/vhost.conf" - - try: - map = " map " + virtualHostName + " " + virtualHostName + "\n" - - if sslUtilities.checkSSLListener() != 1: - - writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') - - listener = "listener SSL {" + "\n" - address = " address *: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 30" + "\n" + try: 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(map) - writeDataToFile.writelines(final) - writeDataToFile.writelines("\n") - writeDataToFile.close() + if sslUtilities.checkSSLListener() != 1: + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') - else: - - if sslUtilities.checkIfSSLMap(virtualHostName) == 0: - - data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() - writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'w') - sslCheck = 0 - - for items in data: - if items.find("listener") > -1 and items.find("SSL") > -1: - sslCheck = 1 - - if (sslCheck == 1): - writeDataToFile.writelines(items) - writeDataToFile.writelines(map) - sslCheck = 0 - else: - writeDataToFile.writelines(items) - writeDataToFile.close() - - ###################### Write per host Configs for SSL ################### - - data = open(completePathToConfigFile, "r").readlines() - - ## check if vhssl is already in vhconf file - - vhsslPresense = 0 - - for items in data: - if items.find("vhssl") > -1: - vhsslPresense = 1 - - if vhsslPresense == 0: - writeSSLConfig = open(completePathToConfigFile, "a") - - vhssl = "vhssl {" + "\n" - keyFile = " keyFile /etc/letsencrypt/live/" + virtualHostName + "/privkey.pem\n" - certFile = " certFile /etc/letsencrypt/live/" + virtualHostName + "/fullchain.pem\n" + listener = "listener SSL {" + "\n" + address = " address *: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 30" + "\n" - final = "}" + map = " map " + virtualHostName + " " + virtualHostName + "\n" + final = "}" + "\n" + "\n" - writeSSLConfig.writelines("\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(map) + writeDataToFile.writelines(final) + writeDataToFile.writelines("\n") + writeDataToFile.close() - writeSSLConfig.writelines(vhssl) - writeSSLConfig.writelines(keyFile) - writeSSLConfig.writelines(certFile) - writeSSLConfig.writelines(certChain) - writeSSLConfig.writelines(sslProtocol) - writeSSLConfig.writelines(final) - writeSSLConfig.writelines("\n") + else: - writeSSLConfig.close() + if sslUtilities.checkIfSSLMap(virtualHostName) == 0: - return 1 + data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'w') + sslCheck = 0 + + for items in data: + if items.find("listener") > -1 and items.find("SSL") > -1: + sslCheck = 1 + + if (sslCheck == 1): + writeDataToFile.writelines(items) + writeDataToFile.writelines(map) + sslCheck = 0 + else: + writeDataToFile.writelines(items) + writeDataToFile.close() + + ###################### Write per host Configs for SSL ################### + + data = open(completePathToConfigFile, "r").readlines() + + ## check if vhssl is already in vhconf file + + vhsslPresense = 0 + + for items in data: + if items.find("vhssl") > -1: + vhsslPresense = 1 + + if vhsslPresense == 0: + writeSSLConfig = open(completePathToConfigFile, "a") + + vhssl = "vhssl {" + "\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 30" + "\n" + final = "}" + + writeSSLConfig.writelines("\n") + + writeSSLConfig.writelines(vhssl) + writeSSLConfig.writelines(keyFile) + writeSSLConfig.writelines(certFile) + writeSSLConfig.writelines(certChain) + writeSSLConfig.writelines(sslProtocol) + writeSSLConfig.writelines(final) + + writeSSLConfig.writelines("\n") + + writeSSLConfig.close() + + return 1 + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [installSSLForDomain]]") + return 0 + else: + confPath = sslUtilities.Server_root + "/conf/vhosts/" + virtualHostName + completePathToConfigFile = confPath + "/vhost.conf" + + ## Check if SSL VirtualHost already exists + + data = open(completePathToConfigFile, 'r').readlines() + + for items in data: + if items.find('*:443') > -1: + return 1 + + try: + + try: + chilDomain = ChildDomains.objects.get(domain=virtualHostName) + externalApp = chilDomain.master.externalApp + DocumentRoot = ' DocumentRoot ' + chilDomain.path + '\n' + except BaseException, msg: + website = Websites.objects.get(domain=virtualHostName) + externalApp = website.externalApp + DocumentRoot = ' DocumentRoot /home/' + virtualHostName + '/public_html\n' + + data = open(completePathToConfigFile, 'r').readlines() + phpHandler = '' + + for items in data: + if items.find('AddHandler') > -1 and items.find('php') > -1: + phpHandler = items + break + + confFile = open(completePathToConfigFile, 'a') + + doNotModify = '\n\n# Do not modify this file, this is auto-generated file.\n\n' + + VirtualHost = '\n\n' + ServerName = ' ServerName ' + virtualHostName + '\n' + ServerAlias = ' ServerAlias www.' + virtualHostName + '\n' + ScriptAlias = ' Alias /.filemanager/ /usr/local/lsws/FileManager\n' + ServerAdmin = ' ServerAdmin ' + adminEmail + '\n' + SeexecUserGroup = ' SuexecUserGroup ' + externalApp + ' ' + externalApp + '\n' + CustomLogCombined = ' CustomLog /home/' + virtualHostName + '/logs/' + virtualHostName + '.access_log combined\n' + + confFile.writelines(doNotModify) + confFile.writelines(VirtualHost) + confFile.writelines(ServerName) + confFile.writelines(ServerAlias) + confFile.writelines(ScriptAlias) + confFile.writelines(ServerAdmin) + confFile.writelines(SeexecUserGroup) + confFile.writelines(DocumentRoot) + confFile.writelines(CustomLogCombined) + DirectoryFileManager = """\n + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_value display_errors "Off" + php_value upload_max_filesize "200M" + php_value post_max_size "250M" + \n""" + confFile.writelines(DirectoryFileManager) + + SSLEngine = ' SSLEngine on\n' + SSLVerifyClient = ' SSLVerifyClient none\n' + SSLCertificateFile = ' SSLCertificateFile /etc/letsencrypt/live/' + virtualHostName + '/fullchain.pem\n' + SSLCertificateKeyFile = ' SSLCertificateKeyFile /etc/letsencrypt/live/' + virtualHostName + '/privkey.pem\n' + + confFile.writelines(SSLEngine) + confFile.writelines(SSLVerifyClient) + confFile.writelines(SSLCertificateFile) + confFile.writelines(SSLCertificateKeyFile) + confFile.writelines(phpHandler) + + VirtualHostEnd = '\n' + confFile.writelines(VirtualHostEnd) + confFile.close() + return 1 + + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [installSSLForDomain]") + return 0 - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [installSSLForDomain]]") - return 0 @staticmethod def obtainSSLForADomain(virtualHostName,adminEmail,sslpath, aliasDomain = None): try: acmePath = '/root/.acme.sh/acme.sh' - if os.path.exists('/etc/lsb-release'): + if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: acmePath = '/home/cyberpanel/.acme.sh/acme.sh' if not os.path.exists(acmePath): @@ -239,30 +320,13 @@ class sslUtilities: def issueSSLForDomain(domain, adminEmail, sslpath, aliasDomain = None): try: - if sslUtilities.obtainSSLForADomain(domain, adminEmail, sslpath, aliasDomain) == 1: - - if sslUtilities.installSSLForDomain(domain) == 1: + if sslUtilities.installSSLForDomain(domain, adminEmail) == 1: return [1, "None"] else: return [0, "210 Failed to install SSL for domain. [issueSSLForDomain]"] else: - pathToStoreSSL = "/etc/letsencrypt/live/" + domain - command = 'mkdir -p ' + pathToStoreSSL - subprocess.call(shlex.split(command)) - - pathToStoreSSLPrivKey = "/etc/letsencrypt/live/" + domain + "/privkey.pem" - pathToStoreSSLFullChain = "/etc/letsencrypt/live/" + domain + "/fullchain.pem" - - command = 'openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" -keyout ' + pathToStoreSSLPrivKey + ' -out ' + pathToStoreSSLFullChain - cmd = shlex.split(command) - subprocess.call(cmd) - - if sslUtilities.installSSLForDomain(domain) == 1: - logging.CyberCPLogFileWriter.writeToFile("Self signed SSL issued for " + domain + ".") - return [1, "None"] - else: - return [0, "220 Failed to install SSL for domain. [issueSSLForDomain]"] + return [0, "283 Failed to obtain SSL for domain. [issueSSLForDomain]"] except BaseException,msg: return [0, "347 "+ str(msg)+ " [issueSSLForDomain]"] \ No newline at end of file diff --git a/plogical/vhost.py b/plogical/vhost.py index a8aa849ce..e9932c80e 100644 --- a/plogical/vhost.py +++ b/plogical/vhost.py @@ -16,6 +16,7 @@ from databases.models import Databases from mysqlUtilities import mysqlUtilities from dnsUtilities import DNS from random import randint +from processUtilities import ProcessUtilities ## If you want justice, you have come to the wrong place. @@ -87,7 +88,12 @@ class vhost: cmd = shlex.split(command) subprocess.call(cmd, stdout=FNULL, stderr=subprocess.STDOUT) - command = "chmod -R 666 " + pathLogs + + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + command = "chmod -R 666 " + pathLogs + else: + command = "chmod -R 755 " + pathLogs + cmd = shlex.split(command) subprocess.call(cmd, stdout=FNULL, stderr=subprocess.STDOUT) @@ -176,215 +182,279 @@ class vhost: @staticmethod def perHostVirtualConf(vhFile, administratorEmail,virtualHostUser, phpVersion, virtualHostName, openBasedir): # General Configurations tab - try: - confFile = open(vhFile, "w+") + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + try: + confFile = open(vhFile, "w+") - docRoot = "docRoot $VH_ROOT/public_html" + "\n" - vhDomain = "vhDomain $VH_NAME" + "\n" - vhAliases = "vhAliases www.$VH_NAME"+ "\n" - adminEmails = "adminEmails " + administratorEmail + "\n" - enableGzip = "enableGzip 1" + "\n" - enableIpGeo = "enableIpGeo 1" + "\n" + "\n" + docRoot = "docRoot $VH_ROOT/public_html" + "\n" + vhDomain = "vhDomain $VH_NAME" + "\n" + vhAliases = "vhAliases www.$VH_NAME"+ "\n" + adminEmails = "adminEmails " + administratorEmail + "\n" + enableGzip = "enableGzip 1" + "\n" + enableIpGeo = "enableIpGeo 1" + "\n" + "\n" - confFile.writelines(docRoot) - confFile.writelines(vhDomain) - confFile.writelines(vhAliases) - confFile.writelines(adminEmails) - confFile.writelines(enableGzip) - confFile.writelines(enableIpGeo) + confFile.writelines(docRoot) + confFile.writelines(vhDomain) + confFile.writelines(vhAliases) + confFile.writelines(adminEmails) + confFile.writelines(enableGzip) + confFile.writelines(enableIpGeo) - # Index file settings + # Index file settings - index = "index {" + "\n" - userServer = " useServer 0" + "\n" - indexFiles = " indexFiles index.php, index.html" + "\n" - index_end = "}" + "\n" + "\n" + index = "index {" + "\n" + userServer = " useServer 0" + "\n" + indexFiles = " indexFiles index.php, index.html" + "\n" + index_end = "}" + "\n" + "\n" - confFile.writelines(index) - confFile.writelines(userServer) - confFile.writelines(indexFiles) - confFile.writelines(index_end) + confFile.writelines(index) + confFile.writelines(userServer) + confFile.writelines(indexFiles) + confFile.writelines(index_end) - # Error Log Settings + # Error Log Settings - error_log = "errorlog $VH_ROOT/logs/$VH_NAME.error_log {" + "\n" - useServer = " useServer 0" + "\n" - logLevel = " logLevel ERROR" + "\n" - rollingSize = " rollingSize 10M" + "\n" - error_log_end = "}" + "\n" + "\n" + error_log = "errorlog $VH_ROOT/logs/$VH_NAME.error_log {" + "\n" + useServer = " useServer 0" + "\n" + logLevel = " logLevel ERROR" + "\n" + rollingSize = " rollingSize 10M" + "\n" + error_log_end = "}" + "\n" + "\n" - confFile.writelines(error_log) - confFile.writelines(useServer) - confFile.writelines(logLevel) - confFile.writelines(rollingSize) - confFile.writelines(error_log_end) + confFile.writelines(error_log) + confFile.writelines(useServer) + confFile.writelines(logLevel) + confFile.writelines(rollingSize) + confFile.writelines(error_log_end) - # Access Log Settings + # Access Log Settings - access_Log = "accesslog $VH_ROOT/logs/$VH_NAME.access_log {" + "\n" - useServer = " useServer 0" + "\n" - logFormat = ' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n" - logHeaders = " logHeaders 5" + "\n" - rollingSize = " rollingSize 10M" + "\n" - keepDays = " keepDays 10" - compressArchive = " compressArchive 1" + "\n" - access_Log_end = "}" + "\n" + "\n" + access_Log = "accesslog $VH_ROOT/logs/$VH_NAME.access_log {" + "\n" + useServer = " useServer 0" + "\n" + logFormat = ' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n" + logHeaders = " logHeaders 5" + "\n" + rollingSize = " rollingSize 10M" + "\n" + keepDays = " keepDays 10" + compressArchive = " compressArchive 1" + "\n" + access_Log_end = "}" + "\n" + "\n" - confFile.writelines(access_Log) - confFile.writelines(useServer) - confFile.writelines(logFormat) - confFile.writelines(logHeaders) - confFile.writelines(rollingSize) - confFile.writelines(keepDays) - confFile.writelines(compressArchive) - confFile.writelines(access_Log_end) + confFile.writelines(access_Log) + confFile.writelines(useServer) + confFile.writelines(logFormat) + confFile.writelines(logHeaders) + confFile.writelines(rollingSize) + confFile.writelines(keepDays) + confFile.writelines(compressArchive) + confFile.writelines(access_Log_end) - # php settings + # php settings - scripthandler = "scripthandler {" + "\n" - add = " add lsapi:"+virtualHostUser+" php" + "\n" - php_end = "}" + "\n" + "\n" + scripthandler = "scripthandler {" + "\n" + add = " add lsapi:"+virtualHostUser+" php" + "\n" + php_end = "}" + "\n" + "\n" - confFile.writelines(scripthandler) - confFile.writelines(add) - confFile.writelines(php_end) + confFile.writelines(scripthandler) + confFile.writelines(add) + confFile.writelines(php_end) - ## external app + ## external app - if phpVersion == "PHP 5.3": - php = "53" - elif phpVersion == "PHP 5.4": - php = "55" - elif phpVersion == "PHP 5.5": - php = "55" - elif phpVersion == "PHP 5.6": - php = "56" - elif phpVersion == "PHP 7.0": - php = "70" - elif phpVersion == "PHP 7.1": - php = "71" - elif phpVersion == "PHP 7.2": - php = "72" + if phpVersion == "PHP 5.3": + php = "53" + elif phpVersion == "PHP 5.4": + php = "55" + elif phpVersion == "PHP 5.5": + php = "55" + elif phpVersion == "PHP 5.6": + php = "56" + elif phpVersion == "PHP 7.0": + php = "70" + elif phpVersion == "PHP 7.1": + php = "71" + elif phpVersion == "PHP 7.2": + php = "72" - extprocessor = "extprocessor "+virtualHostUser+" {\n" - type = " type lsapi\n" - address = " address UDS://tmp/lshttpd/"+virtualHostUser+".sock\n" - maxConns = " maxConns 10\n" - env = " env LSAPI_CHILDREN=10\n" - initTimeout = " initTimeout 600\n" - retryTimeout = " retryTimeout 0\n" - persistConn = " persistConn 1\n" - persistConnTimeout = " pcKeepAliveTimeout 1\n" - respBuffer = " respBuffer 0\n" - autoStart = " autoStart 1\n" - path = " path /usr/local/lsws/lsphp"+php+"/bin/lsphp\n" - extUser = " extUser " + virtualHostUser + "\n" - extGroup = " extGroup " + virtualHostUser + "\n" - memSoftLimit = " memSoftLimit 2047M\n" - memHardLimit = " memHardLimit 2047M\n" - procSoftLimit = " procSoftLimit 400\n" - procHardLimit = " procHardLimit 500\n" - extprocessorEnd = "}\n" + extprocessor = "extprocessor "+virtualHostUser+" {\n" + type = " type lsapi\n" + address = " address UDS://tmp/lshttpd/"+virtualHostUser+".sock\n" + maxConns = " maxConns 10\n" + env = " env LSAPI_CHILDREN=10\n" + initTimeout = " initTimeout 600\n" + retryTimeout = " retryTimeout 0\n" + persistConn = " persistConn 1\n" + persistConnTimeout = " pcKeepAliveTimeout 1\n" + respBuffer = " respBuffer 0\n" + autoStart = " autoStart 1\n" + path = " path /usr/local/lsws/lsphp"+php+"/bin/lsphp\n" + extUser = " extUser " + virtualHostUser + "\n" + extGroup = " extGroup " + virtualHostUser + "\n" + memSoftLimit = " memSoftLimit 2047M\n" + memHardLimit = " memHardLimit 2047M\n" + procSoftLimit = " procSoftLimit 400\n" + procHardLimit = " procHardLimit 500\n" + extprocessorEnd = "}\n" - confFile.writelines(extprocessor) - confFile.writelines(type) - confFile.writelines(address) - confFile.writelines(maxConns) - confFile.writelines(env) - confFile.writelines(initTimeout) - confFile.writelines(retryTimeout) - confFile.writelines(persistConn) - confFile.writelines(persistConnTimeout) - confFile.writelines(respBuffer) - confFile.writelines(autoStart) - confFile.writelines(path) - confFile.writelines(extUser) - confFile.writelines(extGroup) - confFile.writelines(memSoftLimit) - confFile.writelines(memHardLimit) - confFile.writelines(procSoftLimit) - confFile.writelines(procHardLimit) - confFile.writelines(extprocessorEnd) + confFile.writelines(extprocessor) + confFile.writelines(type) + confFile.writelines(address) + confFile.writelines(maxConns) + confFile.writelines(env) + confFile.writelines(initTimeout) + confFile.writelines(retryTimeout) + confFile.writelines(persistConn) + confFile.writelines(persistConnTimeout) + confFile.writelines(respBuffer) + confFile.writelines(autoStart) + confFile.writelines(path) + confFile.writelines(extUser) + confFile.writelines(extGroup) + confFile.writelines(memSoftLimit) + confFile.writelines(memHardLimit) + confFile.writelines(procSoftLimit) + confFile.writelines(procHardLimit) + confFile.writelines(extprocessorEnd) - ## File Manager defination + ## File Manager defination - context = "context /.filemanager {\n" - location = " location /usr/local/lsws/Example/html/FileManager\n" - allowBrowse = " allowBrowse 1\n" - autoIndex = " autoIndex 1\n\n" + context = "context /.filemanager {\n" + location = " location /usr/local/lsws/Example/html/FileManager\n" + allowBrowse = " allowBrowse 1\n" + autoIndex = " autoIndex 1\n\n" - accessControl = " accessControl {\n" - allow = " allow 127.0.0.1, localhost\n" - deny = " deny 0.0.0.0/0\n" - accessControlEnds = " }\n" + accessControl = " accessControl {\n" + allow = " allow 127.0.0.1, localhost\n" + deny = " deny 0.0.0.0/0\n" + accessControlEnds = " }\n" - rewriteInherit = """ rewrite { - inherit 0 + rewriteInherit = """ rewrite { + inherit 0 + + } + """ - } - """ - - phpIniOverride = "phpIniOverride {\n" - php_admin_value = 'php_admin_value open_basedir "/tmp:/usr/local/lsws/Example/html/FileManager:$VH_ROOT"\n' - php_value = 'php_value display_errors "Off"\n' - php_value_upload_max_size = 'php_value upload_max_filesize "200M"\n' - php_value_post_max_size = 'php_value post_max_size "250M"\n' - endPHPIniOverride = "}\n" + phpIniOverride = "phpIniOverride {\n" + php_admin_value = 'php_admin_value open_basedir "/tmp:/usr/local/lsws/Example/html/FileManager:$VH_ROOT"\n' + php_value = 'php_value display_errors "Off"\n' + php_value_upload_max_size = 'php_value upload_max_filesize "200M"\n' + php_value_post_max_size = 'php_value post_max_size "250M"\n' + endPHPIniOverride = "}\n" - defaultCharSet = " addDefaultCharset off\n" - contextEnds = "}\n" + defaultCharSet = " addDefaultCharset off\n" + contextEnds = "}\n" - confFile.writelines(context) - confFile.writelines(location) - confFile.writelines(allowBrowse) - confFile.writelines(autoIndex) - confFile.writelines(accessControl) - confFile.writelines(allow) - confFile.writelines(deny) - confFile.writelines(accessControlEnds) - confFile.write(rewriteInherit) + confFile.writelines(context) + confFile.writelines(location) + confFile.writelines(allowBrowse) + confFile.writelines(autoIndex) + confFile.writelines(accessControl) + confFile.writelines(allow) + confFile.writelines(deny) + confFile.writelines(accessControlEnds) + confFile.write(rewriteInherit) - confFile.writelines(phpIniOverride) - if openBasedir == 1: - confFile.writelines(php_admin_value) - confFile.write(php_value) - confFile.write(php_value_upload_max_size) - confFile.write(php_value_post_max_size) - confFile.writelines(endPHPIniOverride) + confFile.writelines(phpIniOverride) + if openBasedir == 1: + confFile.writelines(php_admin_value) + confFile.write(php_value) + confFile.write(php_value_upload_max_size) + confFile.write(php_value_post_max_size) + confFile.writelines(endPHPIniOverride) - confFile.writelines(defaultCharSet) - confFile.writelines(contextEnds) + confFile.writelines(defaultCharSet) + confFile.writelines(contextEnds) - ## OpenBase Dir Protection + ## OpenBase Dir Protection - phpIniOverride = "phpIniOverride {\n" - php_admin_value = 'php_admin_value open_basedir "/tmp:$VH_ROOT"\n' - endPHPIniOverride = "}\n" + phpIniOverride = "phpIniOverride {\n" + php_admin_value = 'php_admin_value open_basedir "/tmp:$VH_ROOT"\n' + endPHPIniOverride = "}\n" - confFile.writelines(phpIniOverride) - if openBasedir == 1: - confFile.writelines(php_admin_value) - confFile.writelines(endPHPIniOverride) + confFile.writelines(phpIniOverride) + if openBasedir == 1: + confFile.writelines(php_admin_value) + confFile.writelines(endPHPIniOverride) - htaccessAutoLoad = """ -rewrite { - enable 1 - autoLoadHtaccess 1 -} -""" - confFile.write(htaccessAutoLoad) + htaccessAutoLoad = """ + rewrite { + enable 1 + autoLoadHtaccess 1 + } + """ + confFile.write(htaccessAutoLoad) - confFile.close() + confFile.close() + + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [IO Error with per host config file [perHostVirtualConf]]") + return 0 + return 1 + else: + try: + confFile = open(vhFile, "w+") + + doNotModify = '# Do not modify this file, this is auto-generated file.\n\n' + + VirtualHost = '\n\n' + ServerName = ' ServerName ' + virtualHostName + '\n' + ServerAlias = ' ServerAlias www.' + virtualHostName + '\n' + ScriptAlias = ' Alias /.filemanager/ /usr/local/lsws/FileManager\n' + ServerAdmin = ' ServerAdmin ' + administratorEmail + '\n' + SeexecUserGroup = ' SuexecUserGroup ' + virtualHostUser + ' ' + virtualHostUser + '\n' + DocumentRoot = ' DocumentRoot /home/' + virtualHostName + '/public_html\n' + CustomLogCombined = ' CustomLog /home/' + virtualHostName + '/logs/' + virtualHostName + '.access_log combined\n' + + confFile.writelines(doNotModify) + confFile.writelines(VirtualHost) + confFile.writelines(ServerName) + confFile.writelines(ServerAlias) + confFile.writelines(ScriptAlias) + confFile.writelines(ServerAdmin) + confFile.writelines(SeexecUserGroup) + confFile.writelines(DocumentRoot) + confFile.writelines(CustomLogCombined) + + DirectoryFileManager = """\n + Options +Includes -Indexes +ExecCGI + php_value display_errors "Off" + php_value upload_max_filesize "200M" + php_value post_max_size "250M" + \n""" + confFile.writelines(DirectoryFileManager) + + ## external app + + if phpVersion == "PHP 5.3": + php = "53" + elif phpVersion == "PHP 5.4": + php = "55" + elif phpVersion == "PHP 5.5": + php = "55" + elif phpVersion == "PHP 5.6": + php = "56" + elif phpVersion == "PHP 7.0": + php = "70" + elif phpVersion == "PHP 7.1": + php = "71" + elif phpVersion == "PHP 7.2": + php = "72" + + AddType = ' AddHandler application/x-httpd-php' + php + ' .php .php7 .phtml\n\n' + VirtualHostEnd = '\n' + + confFile.writelines(AddType) + confFile.writelines(VirtualHostEnd) + + confFile.close() + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [IO Error with per host config file [perHostVirtualConf]]") + return 0 + return 1 - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile( - str(msg) + " [IO Error with per host config file [perHostVirtualConf]]") - return 0 - return 1 @staticmethod def createNONSSLMapEntry(virtualHostName): @@ -420,121 +490,203 @@ rewrite { #restrained 1 #} - try: + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + try: - if vhost.createNONSSLMapEntry(virtualHostName) == 0: - return [0, "Failed to create NON SSL Map Entry [createConfigInMainVirtualHostFile]"] + if vhost.createNONSSLMapEntry(virtualHostName) == 0: + return [0, "Failed to create NON SSL Map Entry [createConfigInMainVirtualHostFile]"] - writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') - writeDataToFile.writelines("virtualHost " + virtualHostName + " {\n") - writeDataToFile.writelines(" vhRoot /home/$VH_NAME\n") - writeDataToFile.writelines(" configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhost.conf\n") - writeDataToFile.writelines(" allowSymbolLink 1\n") - writeDataToFile.writelines(" enableScript 1\n") - writeDataToFile.writelines(" restrained 1\n") - writeDataToFile.writelines("}\n") - writeDataToFile.writelines("\n") + writeDataToFile.writelines("virtualHost " + virtualHostName + " {\n") + writeDataToFile.writelines(" vhRoot /home/$VH_NAME\n") + writeDataToFile.writelines(" configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhost.conf\n") + writeDataToFile.writelines(" allowSymbolLink 1\n") + writeDataToFile.writelines(" enableScript 1\n") + writeDataToFile.writelines(" restrained 1\n") + writeDataToFile.writelines("}\n") + writeDataToFile.writelines("\n") - writeDataToFile.close() + writeDataToFile.close() - writeDataToFile.close() - return [1,"None"] + writeDataToFile.close() + return [1,"None"] + except BaseException,msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + "223 [IO Error with main config file [createConfigInMainVirtualHostFile]]") + return [0,"223 [IO Error with main config file [createConfigInMainVirtualHostFile]]"] + else: + try: + writeDataToFile = open("/usr/local/lsws/conf/httpd.conf", 'a') + configFile = 'Include /usr/local/lsws/conf/vhosts/' + virtualHostName + '/vhost.conf\n' + writeDataToFile.writelines(configFile) + writeDataToFile.close() - except BaseException,msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg) + "223 [IO Error with main config file [createConfigInMainVirtualHostFile]]") - return [0,"223 [IO Error with main config file [createConfigInMainVirtualHostFile]]"] + writeDataToFile.close() + return [1, "None"] + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + "223 [IO Error with main config file [createConfigInMainVirtualHostFile]]") + return [0, "223 [IO Error with main config file [createConfigInMainVirtualHostFile]]"] @staticmethod def deleteVirtualHostConfigurations(virtualHostName): + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + try: - try: + ## Deleting master conf + numberOfSites = str(Websites.objects.count() + ChildDomains.objects.count()) + vhost.deleteCoreConf(virtualHostName, numberOfSites) - ## Deleting master conf - numberOfSites = str(Websites.objects.count() + ChildDomains.objects.count()) - vhost.deleteCoreConf(virtualHostName, numberOfSites) + delWebsite = Websites.objects.get(domain=virtualHostName) + databases = Databases.objects.filter(website=delWebsite) - delWebsite = Websites.objects.get(domain=virtualHostName) - databases = Databases.objects.filter(website=delWebsite) + childDomains = delWebsite.childdomains_set.all() - childDomains = delWebsite.childdomains_set.all() + ## Deleting child domains - ## Deleting child domains + for items in childDomains: + numberOfSites = Websites.objects.count() + ChildDomains.objects.count() + vhost.deleteCoreConf(items.domain, numberOfSites) - for items in childDomains: - numberOfSites = Websites.objects.count() + ChildDomains.objects.count() - vhost.deleteCoreConf(items.domain, numberOfSites) + for items in databases: + mysqlUtilities.deleteDatabase(items.dbName, items.dbUser) - for items in databases: - mysqlUtilities.deleteDatabase(items.dbName, items.dbUser) + delWebsite.delete() - delWebsite.delete() + ## Deleting DNS Zone if there is any. - ## Deleting DNS Zone if there is any. + DNS.deleteDNSZone(virtualHostName) - DNS.deleteDNSZone(virtualHostName) + installUtilities.installUtilities.reStartLiteSpeed() - installUtilities.installUtilities.reStartLiteSpeed() + ## Delete mail accounts - ## Delete mail accounts + command = "sudo rm -rf /home/vmail/" + virtualHostName + subprocess.call(shlex.split(command)) + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") + return 0 + return 1 + else: + try: + ## Deleting master conf + numberOfSites = str(Websites.objects.count() + ChildDomains.objects.count()) + vhost.deleteCoreConf(virtualHostName, numberOfSites) - command = "sudo rm -rf /home/vmail/" + virtualHostName - subprocess.call(shlex.split(command)) + delWebsite = Websites.objects.get(domain=virtualHostName) + databases = Databases.objects.filter(website=delWebsite) - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") - return 0 + childDomains = delWebsite.childdomains_set.all() + + ## Deleting child domains + + for items in childDomains: + numberOfSites = Websites.objects.count() + ChildDomains.objects.count() + vhost.deleteCoreConf(items.domain, numberOfSites) + + for items in databases: + mysqlUtilities.deleteDatabase(items.dbName, items.dbUser) + + delWebsite.delete() + + ## Deleting DNS Zone if there is any. + + DNS.deleteDNSZone(virtualHostName) + + installUtilities.installUtilities.reStartLiteSpeed() + + ## Delete mail accounts + + command = "sudo rm -rf /home/vmail/" + virtualHostName + subprocess.call(shlex.split(command)) + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") + return 0 + return 1 - return 1 @staticmethod def deleteCoreConf(virtualHostName, numberOfSites): - try: + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + try: + virtualHostPath = "/home/" + virtualHostName + if os.path.exists(virtualHostPath): + shutil.rmtree(virtualHostPath) + + confPath = vhost.Server_root + "/conf/vhosts/" + virtualHostName + if os.path.exists(confPath): + shutil.rmtree(confPath) + + data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() + + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'w') + + check = 1 + sslCheck = 1 + + for items in data: + if numberOfSites == 1: + if (items.find(' ' + virtualHostName) > -1 and items.find(" map " + virtualHostName) > -1): + continue + if (items.find(' ' + virtualHostName) > -1 and (items.find("virtualHost") > -1 or items.find("virtualhost") > -1)): + check = 0 + if items.find("listener") > -1 and items.find("SSL") > -1: + sslCheck = 0 + if (check == 1 and sslCheck == 1): + writeDataToFile.writelines(items) + if (items.find("}") > -1 and (check == 0 or sslCheck == 0)): + check = 1 + sslCheck = 1 + else: + if (items.find(' ' + virtualHostName) > -1 and items.find(" map " + virtualHostName) > -1): + continue + if (items.find(' ' + virtualHostName) > -1 and (items.find("virtualHost") > -1 or items.find("virtualhost") > -1)): + check = 0 + if (check == 1): + writeDataToFile.writelines(items) + if (items.find("}") > -1 and check == 0): + check = 1 + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") + return 0 + return 1 + else: virtualHostPath = "/home/" + virtualHostName - if os.path.exists(virtualHostPath): + try: shutil.rmtree(virtualHostPath) + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [Not able to remove virtual host directory from /home continuing..]") - confPath = vhost.Server_root + "/conf/vhosts/" + virtualHostName - if os.path.exists(confPath): + try: + confPath = vhost.Server_root + "/conf/vhosts/" + virtualHostName shutil.rmtree(confPath) + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [Not able to remove virtual host configuration directory from /conf ]") - data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() + try: + data = open("/usr/local/lsws/conf/httpd.conf").readlines() - writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'w') + writeDataToFile = open("/usr/local/lsws/conf/httpd.conf", 'w') - check = 1 - sslCheck = 1 - - for items in data: - if numberOfSites == 1: - if (items.find(' ' + virtualHostName) > -1 and items.find(" map " + virtualHostName) > -1): - continue - if (items.find(' ' + virtualHostName) > -1 and (items.find("virtualHost") > -1 or items.find("virtualhost") > -1)): - check = 0 - if items.find("listener") > -1 and items.find("SSL") > -1: - sslCheck = 0 - if (check == 1 and sslCheck == 1): + for items in data: + if items.find('/' + virtualHostName + '/') > -1: + pass + else: writeDataToFile.writelines(items) - if (items.find("}") > -1 and (check == 0 or sslCheck == 0)): - check = 1 - sslCheck = 1 - else: - if (items.find(' ' + virtualHostName) > -1 and items.find(" map " + virtualHostName) > -1): - continue - if (items.find(' ' + virtualHostName) > -1 and (items.find("virtualHost") > -1 or items.find("virtualhost") > -1)): - check = 0 - if (check == 1): - writeDataToFile.writelines(items) - if (items.find("}") > -1 and check == 0): - check = 1 - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile( - str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") - return 0 - return 1 + writeDataToFile.close() + + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") + return 0 + return 1 @staticmethod def checkIfVirtualHostExists(virtualHostName): @@ -544,51 +696,88 @@ rewrite { @staticmethod def changePHP(vhFile, phpVersion): + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + finalphp = 0 + try: + data = open(vhFile, "r").readlines() - # General Configurations tab + if phpVersion == "PHP 5.3": + finalphp = 53 + elif phpVersion == "PHP 5.4": + finalphp = 54 + elif phpVersion == "PHP 5.5": + finalphp = 55 + elif phpVersion == "PHP 5.6": + finalphp = 56 + elif phpVersion == "PHP 7.0": + finalphp = 70 + elif phpVersion == "PHP 7.1": + finalphp = 71 + elif phpVersion == "PHP 7.2": + finalphp = 72 - finalphp = 0 + writeDataToFile = open(vhFile, "w") - try: - data = open(vhFile, "r").readlines() + path = " path /usr/local/lsws/lsphp" + str(finalphp) + "/bin/lsphp\n" - if phpVersion == "PHP 5.3": - finalphp = 53 - elif phpVersion == "PHP 5.4": - finalphp = 54 - elif phpVersion == "PHP 5.5": - finalphp = 55 - elif phpVersion == "PHP 5.6": - finalphp = 56 - elif phpVersion == "PHP 7.0": - finalphp = 70 - elif phpVersion == "PHP 7.1": - finalphp = 71 - elif phpVersion == "PHP 7.2": - finalphp = 72 + for items in data: + if items.find("/usr/local/lsws/lsphp") > -1 and items.find("path") > -1: + writeDataToFile.writelines(path) + else: + writeDataToFile.writelines(items) - writeDataToFile = open(vhFile, "w") + writeDataToFile.close() - path = " path /usr/local/lsws/lsphp" + str(finalphp) + "/bin/lsphp\n" + installUtilities.installUtilities.reStartLiteSpeed() - for items in data: - if items.find("/usr/local/lsws/lsphp") > -1 and items.find("path") > -1: - writeDataToFile.writelines(path) - else: - writeDataToFile.writelines(items) + print "1,None" + return 1,'None' + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [IO Error with per host config file [changePHP]]") + print 0,str(msg) + return [0, str(msg) + " [IO Error with per host config file [changePHP]]"] + else: + try: + data = open(vhFile, "r").readlines() + if phpVersion == "PHP 5.3": + finalphp = 53 - writeDataToFile.close() + elif phpVersion == "PHP 5.4": + finalphp = 54 + elif phpVersion == "PHP 5.5": + finalphp = 55 + elif phpVersion == "PHP 5.6": + finalphp = 56 + elif phpVersion == "PHP 7.0": + finalphp = 70 + elif phpVersion == "PHP 7.1": + finalphp = 71 + elif phpVersion == "PHP 7.2": + finalphp = 72 - installUtilities.installUtilities.reStartLiteSpeed() + writeDataToFile = open(vhFile, "w") - print "1,None" - return 1,'None' + finalString = ' AddHandler application/x-httpd-php' + str(finalphp) + ' .php\n' + + for items in data: + if items.find("AddHandler application/x-httpd") > -1: + writeDataToFile.writelines(finalString) + else: + writeDataToFile.writelines(items) + + writeDataToFile.close() + + installUtilities.installUtilities.reStartLiteSpeed() + + print "1,None" + return 1, 'None' + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [IO Error with per host config file [changePHP]]") + print 0, str(msg) + return [0, str(msg) + " [IO Error with per host config file [changePHP]]"] - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile( - str(msg) + " [IO Error with per host config file [changePHP]]") - print 0,str(msg) - return [0, str(msg) + " [IO Error with per host config file [changePHP]]"] @staticmethod def addRewriteRules(virtualHostName, fileName=None): @@ -648,8 +837,6 @@ rewrite { print str(inMB) + "," + str(percentage) else: print "0,0" - - except OSError, msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [findDomainBW]") print "0,0" @@ -782,176 +969,227 @@ rewrite { logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [createDirectoryForDomain]]") return [0, "[351 Not able to directories for virtual host [createDirectoryForDomain]]"] - if vhost.perHostDomainConf(path, masterDomain, completePathToConfigFile, - administratorEmail, phpVersion, virtualHostUser, openBasedir) == 1: + if vhost.perHostDomainConf(path, masterDomain, domain, completePathToConfigFile, + administratorEmail, phpVersion, virtualHostUser, openBasedir) == 1: return [1, "None"] else: return [0, "[359 Not able to create per host virtual configurations [perHostVirtualConf]"] @staticmethod - def perHostDomainConf(path, masterDomain, vhFile, administratorEmail, phpVersion, virtualHostUser, openBasedir): + def perHostDomainConf(path, masterDomain, domain, vhFile, administratorEmail, phpVersion, virtualHostUser, openBasedir): + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + try: + confFile = open(vhFile, "w+") - # General Configurations tab + docRoot = "docRoot " + path + "\n" + vhDomain = "vhDomain $VH_NAME" + "\n" + vhAliases = "vhAliases www.$VH_NAME" + "\n" + adminEmails = "adminEmails " + administratorEmail + "\n" + enableGzip = "enableGzip 1" + "\n" + enableIpGeo = "enableIpGeo 1" + "\n" + "\n" - try: - confFile = open(vhFile, "w+") + confFile.writelines(docRoot) + confFile.writelines(vhDomain) + confFile.writelines(vhAliases) + confFile.writelines(adminEmails) + confFile.writelines(enableGzip) + confFile.writelines(enableIpGeo) - docRoot = "docRoot " + path + "\n" - vhDomain = "vhDomain $VH_NAME" + "\n" - vhAliases = "vhAliases www.$VH_NAME" + "\n" - adminEmails = "adminEmails " + administratorEmail + "\n" - enableGzip = "enableGzip 1" + "\n" - enableIpGeo = "enableIpGeo 1" + "\n" + "\n" + # Index file settings - confFile.writelines(docRoot) - confFile.writelines(vhDomain) - confFile.writelines(vhAliases) - confFile.writelines(adminEmails) - confFile.writelines(enableGzip) - confFile.writelines(enableIpGeo) + index = "index {" + "\n" + userServer = " useServer 0" + "\n" + indexFiles = " indexFiles index.php, index.html" + "\n" + index_end = "}" + "\n" + "\n" - # Index file settings + confFile.writelines(index) + confFile.writelines(userServer) + confFile.writelines(indexFiles) + confFile.writelines(index_end) - index = "index {" + "\n" - userServer = " useServer 0" + "\n" - indexFiles = " indexFiles index.php, index.html" + "\n" - index_end = "}" + "\n" + "\n" - - confFile.writelines(index) - confFile.writelines(userServer) - confFile.writelines(indexFiles) - confFile.writelines(index_end) - - # Error Log Settings + # Error Log Settings - error_log = "errorlog $VH_ROOT/logs/" + masterDomain + ".error_log {" + "\n" - useServer = " useServer 0" + "\n" - logLevel = " logLevel ERROR" + "\n" - rollingSize = " rollingSize 10M" + "\n" - error_log_end = "}" + "\n" + "\n" + error_log = "errorlog $VH_ROOT/logs/" + masterDomain + ".error_log {" + "\n" + useServer = " useServer 0" + "\n" + logLevel = " logLevel ERROR" + "\n" + rollingSize = " rollingSize 10M" + "\n" + error_log_end = "}" + "\n" + "\n" - confFile.writelines(error_log) - confFile.writelines(useServer) - confFile.writelines(logLevel) - confFile.writelines(rollingSize) - confFile.writelines(error_log_end) + confFile.writelines(error_log) + confFile.writelines(useServer) + confFile.writelines(logLevel) + confFile.writelines(rollingSize) + confFile.writelines(error_log_end) - # Access Log Settings + # Access Log Settings - access_Log = "accesslog $VH_ROOT/logs/" + masterDomain + ".access_log {" + "\n" - useServer = " useServer 0" + "\n" - logFormat = ' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n" - logHeaders = " logHeaders 5" + "\n" - rollingSize = " rollingSize 10M" + "\n" - keepDays = " keepDays 10" - compressArchive = " compressArchive 1" + "\n" - access_Log_end = "}" + "\n" + "\n" + access_Log = "accesslog $VH_ROOT/logs/" + masterDomain + ".access_log {" + "\n" + useServer = " useServer 0" + "\n" + logFormat = ' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n" + logHeaders = " logHeaders 5" + "\n" + rollingSize = " rollingSize 10M" + "\n" + keepDays = " keepDays 10" + compressArchive = " compressArchive 1" + "\n" + access_Log_end = "}" + "\n" + "\n" - confFile.writelines(access_Log) - confFile.writelines(useServer) - confFile.writelines(logFormat) - confFile.writelines(logHeaders) - confFile.writelines(rollingSize) - confFile.writelines(keepDays) - confFile.writelines(compressArchive) - confFile.writelines(access_Log_end) + confFile.writelines(access_Log) + confFile.writelines(useServer) + confFile.writelines(logFormat) + confFile.writelines(logHeaders) + confFile.writelines(rollingSize) + confFile.writelines(keepDays) + confFile.writelines(compressArchive) + confFile.writelines(access_Log_end) - ## OpenBase Dir Protection + ## OpenBase Dir Protection - phpIniOverride = "phpIniOverride {\n" - php_admin_value = 'php_admin_value open_basedir "/tmp:/usr/local/lsws/Example/html/FileManager:$VH_ROOT"\n' - endPHPIniOverride = "}\n" + phpIniOverride = "phpIniOverride {\n" + php_admin_value = 'php_admin_value open_basedir "/tmp:/usr/local/lsws/Example/html/FileManager:$VH_ROOT"\n' + endPHPIniOverride = "}\n" - confFile.writelines(phpIniOverride) - if openBasedir == 1: - confFile.writelines(php_admin_value) - confFile.writelines(endPHPIniOverride) + confFile.writelines(phpIniOverride) + if openBasedir == 1: + confFile.writelines(php_admin_value) + confFile.writelines(endPHPIniOverride) - # php settings + # php settings - sockRandomPath = str(randint(1000, 9999)) + sockRandomPath = str(randint(1000, 9999)) - scripthandler = "scripthandler {" + "\n" - add = " add lsapi:" + virtualHostUser + sockRandomPath + " php" + "\n" - php_end = "}" + "\n" + "\n" + scripthandler = "scripthandler {" + "\n" + add = " add lsapi:" + virtualHostUser + sockRandomPath + " php" + "\n" + php_end = "}" + "\n" + "\n" - confFile.writelines(scripthandler) - confFile.writelines(add) - confFile.writelines(php_end) + confFile.writelines(scripthandler) + confFile.writelines(add) + confFile.writelines(php_end) - ## external app + ## external app - if phpVersion == "PHP 5.3": - php = "53" - elif phpVersion == "PHP 5.4": - php = "55" - elif phpVersion == "PHP 5.5": - php = "55" - elif phpVersion == "PHP 5.6": - php = "56" - elif phpVersion == "PHP 7.0": - php = "70" - elif phpVersion == "PHP 7.1": - php = "71" - elif phpVersion == "PHP 7.2": - php = "72" + if phpVersion == "PHP 5.3": + php = "53" + elif phpVersion == "PHP 5.4": + php = "55" + elif phpVersion == "PHP 5.5": + php = "55" + elif phpVersion == "PHP 5.6": + php = "56" + elif phpVersion == "PHP 7.0": + php = "70" + elif phpVersion == "PHP 7.1": + php = "71" + elif phpVersion == "PHP 7.2": + php = "72" - extprocessor = "extprocessor " + virtualHostUser + sockRandomPath + " {\n" - type = " type lsapi\n" - address = " address UDS://tmp/lshttpd/" + virtualHostUser + sockRandomPath + ".sock\n" - maxConns = " maxConns 10\n" - env = " env LSAPI_CHILDREN=10\n" - initTimeout = " initTimeout 60\n" - retryTimeout = " retryTimeout 0\n" - persistConn = " persistConn 1\n" - persistConnTimeout = " pcKeepAliveTimeout 1\n" - respBuffer = " respBuffer 0\n" - autoStart = " autoStart 1\n" - path = " path /usr/local/lsws/lsphp" + php + "/bin/lsphp\n" - extUser = " extUser " + virtualHostUser + "\n" - extGroup = " extGroup " + virtualHostUser + "\n" - memSoftLimit = " memSoftLimit 2047M\n" - memHardLimit = " memHardLimit 2047M\n" - procSoftLimit = " procSoftLimit 400\n" - procHardLimit = " procHardLimit 500\n" - extprocessorEnd = "}\n" + extprocessor = "extprocessor " + virtualHostUser + sockRandomPath + " {\n" + type = " type lsapi\n" + address = " address UDS://tmp/lshttpd/" + virtualHostUser + sockRandomPath + ".sock\n" + maxConns = " maxConns 10\n" + env = " env LSAPI_CHILDREN=10\n" + initTimeout = " initTimeout 60\n" + retryTimeout = " retryTimeout 0\n" + persistConn = " persistConn 1\n" + persistConnTimeout = " pcKeepAliveTimeout 1\n" + respBuffer = " respBuffer 0\n" + autoStart = " autoStart 1\n" + path = " path /usr/local/lsws/lsphp" + php + "/bin/lsphp\n" + extUser = " extUser " + virtualHostUser + "\n" + extGroup = " extGroup " + virtualHostUser + "\n" + memSoftLimit = " memSoftLimit 2047M\n" + memHardLimit = " memHardLimit 2047M\n" + procSoftLimit = " procSoftLimit 400\n" + procHardLimit = " procHardLimit 500\n" + extprocessorEnd = "}\n" - confFile.writelines(extprocessor) - confFile.writelines(type) - confFile.writelines(address) - confFile.writelines(maxConns) - confFile.writelines(env) - confFile.writelines(initTimeout) - confFile.writelines(retryTimeout) - confFile.writelines(persistConn) - confFile.writelines(persistConnTimeout) - confFile.writelines(respBuffer) - confFile.writelines(autoStart) - confFile.writelines(path) - confFile.writelines(extUser) - confFile.writelines(extGroup) - confFile.writelines(memSoftLimit) - confFile.writelines(memHardLimit) - confFile.writelines(procSoftLimit) - confFile.writelines(procHardLimit) - confFile.writelines(extprocessorEnd) + confFile.writelines(extprocessor) + confFile.writelines(type) + confFile.writelines(address) + confFile.writelines(maxConns) + confFile.writelines(env) + confFile.writelines(initTimeout) + confFile.writelines(retryTimeout) + confFile.writelines(persistConn) + confFile.writelines(persistConnTimeout) + confFile.writelines(respBuffer) + confFile.writelines(autoStart) + confFile.writelines(path) + confFile.writelines(extUser) + confFile.writelines(extGroup) + confFile.writelines(memSoftLimit) + confFile.writelines(memHardLimit) + confFile.writelines(procSoftLimit) + confFile.writelines(procHardLimit) + confFile.writelines(extprocessorEnd) - htaccessAutoLoad = """ -rewrite { - enable 1 - autoLoadHtaccess 1 -} -""" - confFile.write(htaccessAutoLoad) + htaccessAutoLoad = """ + rewrite { + enable 1 + autoLoadHtaccess 1 + } + """ + confFile.write(htaccessAutoLoad) - confFile.close() + confFile.close() + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [IO Error with per host config file [perHostDomainConf]]") + return 0 + return 1 + else: + try: + + confFile = open(vhFile, "w+") + + doNotModify = '# Do not modify this file, this is auto-generated file.\n\n' + + VirtualHost = '\n\n' + ServerName = ' ServerName ' + domain + '\n' + ServerAlias = ' ServerAlias www.' + domain + '\n' + ServerAdmin = ' ServerAdmin ' + administratorEmail + '\n' + SeexecUserGroup = ' SuexecUserGroup ' + virtualHostUser + ' ' + virtualHostUser + '\n' + DocumentRoot = ' DocumentRoot ' + path + '\n' + CustomLogCombined = ' CustomLog /home/' + masterDomain + '/logs/' + masterDomain + '.access_log combined\n' + + confFile.writelines(doNotModify) + confFile.writelines(VirtualHost) + confFile.writelines(ServerName) + confFile.writelines(ServerAlias) + confFile.writelines(ServerAdmin) + confFile.writelines(SeexecUserGroup) + confFile.writelines(DocumentRoot) + confFile.writelines(CustomLogCombined) + + ## external app + + if phpVersion == "PHP 5.3": + php = "53" + elif phpVersion == "PHP 5.4": + php = "55" + elif phpVersion == "PHP 5.5": + php = "55" + elif phpVersion == "PHP 5.6": + php = "56" + elif phpVersion == "PHP 7.0": + php = "70" + elif phpVersion == "PHP 7.1": + php = "71" + elif phpVersion == "PHP 7.2": + php = "72" + + AddType = ' AddHandler application/x-httpd-php' + php + ' .php .php7 .phtml\n\n' + VirtualHostEnd = '\n' + + confFile.writelines(AddType) + confFile.writelines(VirtualHostEnd) + + confFile.close() + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + " [IO Error with per host config file [perHostDomainConf]]") + return 0 + return 1 - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile( - str(msg) + " [IO Error with per host config file [perHostDomainConf]]") - return 0 - return 1 @staticmethod def createConfigInMainDomainHostFile(domain, masterDomain): @@ -963,28 +1201,40 @@ rewrite { # restrained 1 # } - try: + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + try: - if vhost.createNONSSLMapEntry(domain) == 0: - return [0, "Failed to create NON SSL Map Entry [createConfigInMainVirtualHostFile]"] + if vhost.createNONSSLMapEntry(domain) == 0: + return [0, "Failed to create NON SSL Map Entry [createConfigInMainVirtualHostFile]"] - writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') - writeDataToFile.writelines("\n") - writeDataToFile.writelines("virtualHost " + domain + " {\n") - writeDataToFile.writelines(" vhRoot /home/" + masterDomain + "\n") - writeDataToFile.writelines(" configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhost.conf\n") - writeDataToFile.writelines(" allowSymbolLink 1\n") - writeDataToFile.writelines(" enableScript 1\n") - writeDataToFile.writelines(" restrained 1\n") - writeDataToFile.writelines("}\n") - writeDataToFile.writelines("\n") + writeDataToFile.writelines("\n") + writeDataToFile.writelines("virtualHost " + domain + " {\n") + writeDataToFile.writelines(" vhRoot /home/" + masterDomain + "\n") + writeDataToFile.writelines(" configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhost.conf\n") + writeDataToFile.writelines(" allowSymbolLink 1\n") + writeDataToFile.writelines(" enableScript 1\n") + writeDataToFile.writelines(" restrained 1\n") + writeDataToFile.writelines("}\n") + writeDataToFile.writelines("\n") - writeDataToFile.close() + writeDataToFile.close() - return [1, "None"] + return [1, "None"] - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile( - str(msg) + "223 [IO Error with main config file [createConfigInMainDomainHostFile]]") - return [0, "223 [IO Error with main config file [createConfigInMainDomainHostFile]]"] + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + "223 [IO Error with main config file [createConfigInMainDomainHostFile]]") + return [0, "223 [IO Error with main config file [createConfigInMainDomainHostFile]]"] + else: + try: + writeDataToFile = open("/usr/local/lsws/conf/httpd.conf", 'a') + configFile = 'Include /usr/local/lsws/conf/vhosts/' + domain + '/vhost.conf\n' + writeDataToFile.writelines(configFile) + writeDataToFile.close() + return [1, "None"] + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile( + str(msg) + "223 [IO Error with main config file [createConfigInMainDomainHostFile]]") + return [0, "223 [IO Error with main config file [createConfigInMainDomainHostFile]]"] diff --git a/plogical/website.py b/plogical/website.py index eca026cf5..e35f3c6d3 100644 --- a/plogical/website.py +++ b/plogical/website.py @@ -150,7 +150,6 @@ class WebsiteManager: ## Create Configurations execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py" - execPath = execPath + " createVirtualHost --virtualHostName " + domain + \ " --administratorEmail " + adminEmail + " --phpVersion '" + phpSelection + \ "' --virtualHostUser " + externalApp + " --ssl " + str(data['ssl']) + " --dkimCheck " \ diff --git a/serverStatus/litespeed/FileManager/.idea/FIleManager.iml b/serverStatus/litespeed/FileManager/.idea/FIleManager.iml new file mode 100644 index 000000000..c956989b2 --- /dev/null +++ b/serverStatus/litespeed/FileManager/.idea/FIleManager.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/serverStatus/litespeed/FileManager/.idea/modules.xml b/serverStatus/litespeed/FileManager/.idea/modules.xml new file mode 100644 index 000000000..34abd3fc4 --- /dev/null +++ b/serverStatus/litespeed/FileManager/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/serverStatus/litespeed/FileManager/.idea/workspace.xml b/serverStatus/litespeed/FileManager/.idea/workspace.xml new file mode 100644 index 000000000..026ca8720 --- /dev/null +++ b/serverStatus/litespeed/FileManager/.idea/workspace.xml @@ -0,0 +1,600 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ../../assets + ajax/libs/angularjs/1.2.12/angular.js + AbnTestController + AbnTest + listAction + $commandToExecute + + + assets + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ +
+ + +
+
+ + +
+ + + +
+ +
+
+
+

{% trans "With great wisdom comes great responsibility." %} +

+
+
+ +
+
+
+
+ + + + + +
+
- + + {% else %} +
+ +
+

{% trans "LiteSpeed Status:" %}

+

{% trans "On this page you can get information regarding your LiteSpeed processes." %}

+
+ + +
+
+
+
+
+ + {% if processList %} + +

+ {% trans "LiteSpeed Processes" %} +

+ + + + + + + + + + + {% for items in processList %} + + + + + + {% if forloop.counter == 1 %} + + + {% elif forloop.counter == 2 %} + + + {% else %} + + + {% endif %} + + {% endfor %} + + +
#{% trans "Process ID" %}{% trans "Name" %}
{{ forloop.counter }} {{ items }}{% trans "Main Process" %}{% trans "lscgid Process" %}{% trans "Worker Process" %}
+ {% else %} +
+

{% trans "Could not fetch details, either LiteSpeed is not running or some error occurred, please see CyberPanel Main log file." %}

+
+ {% endif %} + + + + + + + + +
+

{% trans "Action successful." %}

+
+ + +
+

{% trans "Error Occurred. See CyberPanel main log file." %}

+
+ + +
+

{% trans "Could not connect to server." %}

+
+ + +
+
+
+
+
+ + +
+
+

+ {% trans "License Manager" %} +

+ +
+
+ +
+ + + + + {% trans 'License Status' %} + +
+ + +
+ + + + + {% trans 'Change License' %} + + +
+ + +
+ +
+
+
+ +
+
+

{$ lsSerial $}

+

{$ lsexpiration $}

+
+
+
+ +
+ + + +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + + + +
+
+
+
+ + +
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/serverStatus/templates/serverStatus/services.html b/serverStatus/templates/serverStatus/services.html index 54ed94e0f..dab445905 100644 --- a/serverStatus/templates/serverStatus/services.html +++ b/serverStatus/templates/serverStatus/services.html @@ -35,7 +35,7 @@
-
OpenLiteSpeed
+
{{ serverName }}
Stopped
diff --git a/serverStatus/urls.py b/serverStatus/urls.py index fa6060e27..39569e1c4 100644 --- a/serverStatus/urls.py +++ b/serverStatus/urls.py @@ -3,13 +3,17 @@ import views urlpatterns = [ url(r'^$', views.serverStatusHome, name='serverStatusHome'), - url(r'^litespeedStatus', views.litespeedStatus, name='litespeedStatus'), - url(r'^startorstopLitespeed', views.stopOrRestartLitespeed, name='startorstopLitespeed'), - url(r'^cyberCPMainLogFile', views.cyberCPMainLogFile, name='cyberCPMainLogFile'), - url(r'^getFurtherDataFromLogFile',views.getFurtherDataFromLogFile,name='getFurtherDataFromLogFile'), + url(r'^litespeedStatus$', views.litespeedStatus, name='litespeedStatus'), + url(r'^startorstopLitespeed$', views.stopOrRestartLitespeed, name='startorstopLitespeed'), + url(r'^cyberCPMainLogFile$', views.cyberCPMainLogFile, name='cyberCPMainLogFile'), + url(r'^getFurtherDataFromLogFile$',views.getFurtherDataFromLogFile,name='getFurtherDataFromLogFile'), - url(r'^servicesStatus', views.servicesStatus, name='servicesStatus'), - url(r'^servicesAction', views.servicesAction, name='servicesAction'), - url(r'^services', views.services, name='services'), + url(r'^servicesStatus$', views.servicesStatus, name='servicesStatus'), + url(r'^servicesAction$', views.servicesAction, name='servicesAction'), + url(r'^services$', views.services, name='services'), + url(r'^switchTOLSWS$', views.switchTOLSWS, name='switchTOLSWS'), + url(r'^switchTOLSWSStatus$', views.switchTOLSWSStatus, name='switchTOLSWSStatus'), + url(r'^licenseStatus$', views.licenseStatus, name='licenseStatus'), + url(r'^changeLicense$', views.changeLicense, name='changeLicense'), ] \ No newline at end of file diff --git a/serverStatus/views.py b/serverStatus/views.py index 623bd8f1f..b269fadd2 100644 --- a/serverStatus/views.py +++ b/serverStatus/views.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from django.shortcuts import render,redirect from django.http import HttpResponse -from plogical.processUtilities import ProcessUtilities import plogical.CyberCPLogFileWriter as logging from loginSystem.views import loadLoginPage import json @@ -13,6 +12,10 @@ import shlex import socket from plogical.acl import ACLManager import os +from plogical.virtualHostUtilities import virtualHostUtilities +import time +import serverStatusUtil +from plogical.processUtilities import ProcessUtilities # Create your views here. def serverStatusHome(request): @@ -26,7 +29,6 @@ def litespeedStatus(request): try: userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) if currentACL['admin'] == 1: @@ -36,6 +38,9 @@ def litespeedStatus(request): processList = ProcessUtilities.getLitespeedProcessNumber() + OLS = 0 + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + OLS = 1 try: versionInformation = subprocess.check_output(["/usr/local/lsws/bin/lshttpd", "-v"]).split("\n") @@ -54,16 +59,16 @@ def litespeedStatus(request): except subprocess.CalledProcessError,msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[litespeedStatus]") - return render(request,"serverStatus/litespeedStatus.html",{"processList":processList,"liteSpeedVersionStatus":"For some reaons not able to load version details, see CyberCP main log file."}) + return render(request,"serverStatus/litespeedStatus.html",{"processList":processList,"liteSpeedVersionStatus":"For some reaons not able to load version details, see CyberCP main log file.", 'OLS': OLS}) if(processList!=0): dataForHtml = {"processList": processList, "lsversion": lsversion, "modules": modules, - "loadedModules": loadedModules} + "loadedModules": loadedModules, 'OLS':OLS} return render(request,"serverStatus/litespeedStatus.html",dataForHtml) else: dataForHtml = {"lsversion": lsversion, "modules": modules, - "loadedModules": loadedModules} + "loadedModules": loadedModules, 'OLS': OLS} return render(request, "serverStatus/litespeedStatus.html",dataForHtml) except KeyError,msg: @@ -152,8 +157,14 @@ def services(request): pass else: return ACLManager.loadError() + data = {} - return render(request, 'serverStatus/services.html') + if ProcessUtilities.decideServer() == ProcessUtilities.OLS: + data['serverName'] = 'OpenLiteSpeed' + else: + data['serverName'] = 'LiteSpeed Ent' + + return render(request, 'serverStatus/services.html', data) except KeyError: return redirect(loadLoginPage) @@ -302,3 +313,134 @@ def servicesAction(request): final_dic = {'serviceAction': 0, 'error_message': str(msg)} final_json = json.dumps(final_dic) return HttpResponse(final_json) + +def switchTOLSWS(request): + try: + userID = request.session['userID'] + + currentACL = ACLManager.loadedACL(userID) + + if currentACL['admin'] == 1: + pass + else: + return ACLManager.loadErrorJson('status', 0) + + data = json.loads(request.body) + + execPath = "sudo /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/serverStatus/serverStatusUtil.py" + execPath = execPath + " switchTOLSWS --licenseKey " + data['licenseKey'] + + subprocess.Popen(shlex.split(execPath)) + time.sleep(2) + + data_ret = {'status': 1, 'error_message': "None", } + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + except BaseException, msg: + data_ret = {'status': 0, 'error_message': str(msg)} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + +def switchTOLSWSStatus(request): + try: + + command = 'sudo cat ' + serverStatusUtil.ServerStatusUtil.lswsInstallStatusPath + output = subprocess.check_output(shlex.split(command)) + + if output.find('[404]') > -1: + data_ret = {'abort': 1, 'requestStatus': output, 'installed': 0} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + elif output.find('[200]') > -1: + data_ret = {'abort': 1, 'requestStatus': output, 'installed': 1} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + else: + data_ret = {'abort': 0, 'requestStatus': output, 'installed': 0} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + except BaseException, msg: + data_ret = {'abort': 1, 'requestStatus': str(msg), 'installed': 0} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + +def licenseStatus(request): + try: + userID = request.session['userID'] + + try: + currentACL = ACLManager.loadedACL(userID) + + if currentACL['admin'] == 1: + pass + else: + return ACLManager.loadErrorJson('status', 0) + + command = 'sudo cat /usr/local/lsws/conf/serial.no' + serial = subprocess.check_output(shlex.split(command)) + + + command = 'sudo /usr/local/lsws/bin/lshttpd -V' + expiration = subprocess.check_output(shlex.split(command)) + + final_dic = {'status': 1, "erroMessage": 0, 'lsSerial': serial, 'lsexpiration': expiration} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + + except BaseException, msg: + final_dic = {'status': 0, 'erroMessage': str(msg)} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + except KeyError, msg: + final_dic = {'status': 0, 'erroMessage': str(msg)} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + +def changeLicense(request): + try: + userID = request.session['userID'] + + try: + currentACL = ACLManager.loadedACL(userID) + + if currentACL['admin'] == 1: + pass + else: + return ACLManager.loadErrorJson('status', 0) + + data = json.loads(request.body) + newKey = data['newKey'] + + command = 'sudo chown -R cyberpanel:cyberpanel /usr/local/lsws/conf' + subprocess.call(shlex.split(command)) + + serialPath = '/usr/local/lsws/conf/serial.no' + serialFile = open(serialPath, 'w') + serialFile.write(newKey) + serialFile.close() + + command = 'sudo chown -R lsadm:lsadm /usr/local/lsws/conf' + subprocess.call(shlex.split(command)) + + + command = 'sudo /usr/local/lsws/bin/lshttpd -r' + subprocess.call(shlex.split(command)) + + command = 'sudo /usr/local/lsws/bin/lswsctrl restart' + subprocess.call(shlex.split(command)) + + + final_dic = {'status': 1, "erroMessage": 'None'} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + + except BaseException, msg: + final_dic = {'status': 0, 'erroMessage': str(msg)} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + except KeyError, msg: + final_dic = {'status': 0, 'erroMessage': str(msg)} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) \ No newline at end of file diff --git a/static/firewall/firewall.js b/static/firewall/firewall.js index ba9df9207..bb0e4a07f 100644 --- a/static/firewall/firewall.js +++ b/static/firewall/firewall.js @@ -3,10 +3,6 @@ */ - - - - /* Java script code to ADD Firewall Rules */ app.controller('firewallController', function($scope,$http) { @@ -548,8 +544,6 @@ app.controller('firewallController', function($scope,$http) { /* Java script code to ADD Firewall Rules */ - - /* Java script code to Secure SSH */ app.controller('secureSSHCTRL', function($scope,$http) { diff --git a/static/images/litespeed-logo.png b/static/images/litespeed-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac9124e5a901df940868f615e0ea6d10f5388dc GIT binary patch literal 22141 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%0Agz!i%4829uwouhoGs5)>S@Q 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 literal 0 HcmV?d00001 diff --git a/static/serverStatus/serverStatus.js b/static/serverStatus/serverStatus.js index e52d380fe..99b324364 100644 --- a/static/serverStatus/serverStatus.js +++ b/static/serverStatus/serverStatus.js @@ -5,7 +5,7 @@ /* Java script code to start/stop litespeed */ -app.controller('litespeedStatus', function($scope,$http) { +app.controller('litespeedStatus', function ($scope, $http) { $scope.restartorStopLoading = true; $scope.actionResult = true; @@ -13,424 +13,507 @@ app.controller('litespeedStatus', function($scope,$http) { $scope.serverStatusCouldNotConnect = true; - $scope.restartLitespeed = function(){ + $scope.restartLitespeed = function () { - $scope.disableReboot = true; - $scope.disableStop = true; - $scope.restartorStopLoading = false; + $scope.disableReboot = true; + $scope.disableStop = true; + $scope.restartorStopLoading = false; + var url = "/serverstatus/startorstopLitespeed"; + + var data = { + reboot: 1, + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); - var url = "/serverstatus/startorstopLitespeed"; + function ListInitialDatas(response) { - var data = { - reboot:1, - }; + $scope.restartorStopLoading = true; + $scope.disableReboot = false; + $scope.disableStop = false; - var config = { - headers : { - 'X-CSRFToken': getCookie('csrftoken') - } - }; + if (response.data.reboot == 1) { - $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); - - - function ListInitialDatas(response) { - - $scope.restartorStopLoading = true; - $scope.disableReboot = false; - $scope.disableStop = false; - - if(response.data.reboot == 1){ - - $scope.restartorStopLoading = true; - $scope.actionResult = false; - $scope.actionResultBad = true; - $scope.serverStatusCouldNotConnect = true; - - } - else{ - - $scope.restartorStopLoading = true; - $scope.actionResult = true; - $scope.actionResultBad = false; - $scope.serverStatusCouldNotConnect = true; - } - - - } - function cantLoadInitialDatas(response) { - $scope.restartorStopLoading = true; - $scope.actionResult = true; - $scope.actionResultBad = true; - $scope.serverStatusCouldNotConnect = false; - $scope.disableReboot = false; - $scope.disableStop = false; - } + $scope.restartorStopLoading = true; + $scope.actionResult = false; + $scope.actionResultBad = true; + $scope.serverStatusCouldNotConnect = true; + + } + else { + + $scope.restartorStopLoading = true; + $scope.actionResult = true; + $scope.actionResultBad = false; + $scope.serverStatusCouldNotConnect = true; + } + } + function cantLoadInitialDatas(response) { + $scope.restartorStopLoading = true; + $scope.actionResult = true; + $scope.actionResultBad = true; + $scope.serverStatusCouldNotConnect = false; + $scope.disableReboot = false; + $scope.disableStop = false; + } }; - $scope.stopLitespeed = function(){ + $scope.stopLitespeed = function () { - $scope.disableReboot = true; - $scope.disableStop = true; - $scope.restartorStopLoading = false; + $scope.disableReboot = true; + $scope.disableStop = true; + $scope.restartorStopLoading = false; + var url = "/serverstatus/startorstopLitespeed"; + + var data = { + reboot: 0, + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); - var url = "/serverstatus/startorstopLitespeed"; + function ListInitialDatas(response) { - var data = { - reboot:0, - }; + $scope.restartorStopLoading = true; + $scope.disableReboot = false; + $scope.disableStop = false; - var config = { - headers : { - 'X-CSRFToken': getCookie('csrftoken') - } - }; + if (response.data.shutdown == 1) { - $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); - - - function ListInitialDatas(response) { - - $scope.restartorStopLoading = true; - $scope.disableReboot = false; - $scope.disableStop = false; - - if(response.data.shutdown == 1){ - - $scope.restartorStopLoading = true; - $scope.actionResult = false; - $scope.actionResultBad = true; - $scope.serverStatusCouldNotConnect = true; - - } - else{ - - $scope.restartorStopLoading = true; - $scope.actionResult = true; - $scope.actionResultBad = false; - $scope.serverStatusCouldNotConnect = true; - } - - - } - function cantLoadInitialDatas(response) { - $scope.restartorStopLoading = true; - $scope.actionResult = true; - $scope.actionResultBad = true; - $scope.serverStatusCouldNotConnect = false; - $scope.disableReboot = false; - $scope.disableStop = false; - } + $scope.restartorStopLoading = true; + $scope.actionResult = false; + $scope.actionResultBad = true; + $scope.serverStatusCouldNotConnect = true; + + } + else { + + $scope.restartorStopLoading = true; + $scope.actionResult = true; + $scope.actionResultBad = false; + $scope.serverStatusCouldNotConnect = true; + } + } + function cantLoadInitialDatas(response) { + $scope.restartorStopLoading = true; + $scope.actionResult = true; + $scope.actionResultBad = true; + $scope.serverStatusCouldNotConnect = false; + $scope.disableReboot = false; + $scope.disableStop = false; + } }; }); - - /* Java script code to start/stop litespeed */ - - - /* Java script code to read log file */ +app.controller('readCyberCPLogFile', function ($scope, $http) { -app.controller('readCyberCPLogFile', function($scope,$http) { + $scope.logFileLoading = false; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = true; - $scope.logFileLoading = false; - $scope.logsFeteched = true; + + var url = "/serverstatus/getFurtherDataFromLogFile"; + + var data = {}; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + + + if (response.data.logstatus == 1) { + + $scope.logFileLoading = true; + $scope.logsFeteched = false; + $scope.couldNotFetchLogs = true; + + $scope.logsData = response.data.logsdata; + + + } + else { + + $scope.logFileLoading = true; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = false; + + + } + + + } + + function cantLoadInitialDatas(response) { + + $scope.logFileLoading = true; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = false; + + } + + + $scope.fetchLogs = function () { + + + $scope.logFileLoading = false; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = true; + + + var url = "/serverstatus/getFurtherDataFromLogFile"; + + var data = {}; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + + + if (response.data.logstatus == 1) { + + $scope.logFileLoading = true; + $scope.logsFeteched = false; $scope.couldNotFetchLogs = true; - - var url = "/serverstatus/getFurtherDataFromLogFile"; - - var data = {}; - - var config = { - headers : { - 'X-CSRFToken': getCookie('csrftoken') - } - }; - - $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); + $scope.logsData = response.data.logsdata; - function ListInitialDatas(response) { + } + else { - - - if(response.data.logstatus == 1){ - - $scope.logFileLoading = true; - $scope.logsFeteched = false; - $scope.couldNotFetchLogs = true; - - $scope.logsData = response.data.logsdata; - - - - } - else{ - - $scope.logFileLoading = true; - $scope.logsFeteched = true; - $scope.couldNotFetchLogs = false; - - - } - - - } - function cantLoadInitialDatas(response) { - - $scope.logFileLoading = true; - $scope.logsFeteched = true; - $scope.couldNotFetchLogs = false; - - } - - - - - $scope.fetchLogs = function(){ - - - $scope.logFileLoading = false; + $scope.logFileLoading = true; $scope.logsFeteched = true; - $scope.couldNotFetchLogs = true; + $scope.couldNotFetchLogs = false; - var url = "/serverstatus/getFurtherDataFromLogFile"; - - var data = {}; - - var config = { - headers : { - 'X-CSRFToken': getCookie('csrftoken') - } - }; - - $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); + } - function ListInitialDatas(response) { - - - - if(response.data.logstatus == 1){ - - $scope.logFileLoading = true; - $scope.logsFeteched = false; - $scope.couldNotFetchLogs = true; - - $scope.logsData = response.data.logsdata; - - - - } - else{ - - $scope.logFileLoading = true; - $scope.logsFeteched = true; - $scope.couldNotFetchLogs = false; - - - } - - - } - function cantLoadInitialDatas(response) { - - $scope.logFileLoading = true; - $scope.logsFeteched = true; - $scope.couldNotFetchLogs = false; - - } + } + function cantLoadInitialDatas(response) { + $scope.logFileLoading = true; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = false; + } }; }); - - /* Java script code to read log file ends here */ - /* Java script code to read log file ends here */ /* Services */ -app.controller('servicesManager', function($scope,$http) { +app.controller('servicesManager', function ($scope, $http) { - $scope.services = false; - $scope.btnDisable = false; - $scope.actionLoader = false; + $scope.services = false; + $scope.btnDisable = false; + $scope.actionLoader = false; - function getServiceStatus(){ - $scope.btnDisable = true; + function getServiceStatus() { + $scope.btnDisable = true; - url = "/serverstatus/servicesStatus"; + url = "/serverstatus/servicesStatus"; - $http.post(url).then(ListInitialDatas, cantLoadInitialDatas); + $http.post(url).then(ListInitialDatas, cantLoadInitialDatas); - function ListInitialDatas(response) { + function ListInitialDatas(response) { - if (response.data.status.litespeed) { - $scope.olsStatus = "Running"; - $scope.olsStats = true; - $scope.olsStart = false; - $scope.olsStop = true; - $scope.olsMem = Math.round(parseInt(response.data.memUsage.litespeed) / 1048576) + " MB"; - } - else { - $scope.olsStatus = "Stopped"; - $scope.olsStats = false; - $scope.olsStart = true; - $scope.olsStop = false; - } + if (response.data.status.litespeed) { + $scope.olsStatus = "Running"; + $scope.olsStats = true; + $scope.olsStart = false; + $scope.olsStop = true; + $scope.olsMem = Math.round(parseInt(response.data.memUsage.litespeed) / 1048576) + " MB"; + } + else { + $scope.olsStatus = "Stopped"; + $scope.olsStats = false; + $scope.olsStart = true; + $scope.olsStop = false; + } - // Update SQL stats + // Update SQL stats - if (response.data.status.mysql) { - $scope.sqlStatus = "Running"; - $scope.sqlStats = true; - $scope.sqlStart = false; - $scope.sqlStop = true; - $scope.sqlMem = Math.round(parseInt(response.data.memUsage.mysql) / 1048576) + " MB"; - } - else { - $scope.sqlStatus = "Stopped"; - $scope.sqlStats = false; - $scope.sqlStart = true; - $scope.sqlStop = false; - } + if (response.data.status.mysql) { + $scope.sqlStatus = "Running"; + $scope.sqlStats = true; + $scope.sqlStart = false; + $scope.sqlStop = true; + $scope.sqlMem = Math.round(parseInt(response.data.memUsage.mysql) / 1048576) + " MB"; + } + else { + $scope.sqlStatus = "Stopped"; + $scope.sqlStats = false; + $scope.sqlStart = true; + $scope.sqlStop = false; + } - // Update DNS stats + // Update DNS stats - if (response.data.status.powerdns) { - $scope.dnsStatus = "Running"; - $scope.dnsStats = true; - $scope.dnsStart = false; - $scope.dnsStop = true; - $scope.dnsMem = Math.round(parseInt(response.data.memUsage.powerdns) / 1048576) + " MB"; - } - else { - $scope.dnsStatus = "Stopped"; - $scope.dnsStats = false; - $scope.dnsStart = true; - $scope.dnsStop = false; - } + if (response.data.status.powerdns) { + $scope.dnsStatus = "Running"; + $scope.dnsStats = true; + $scope.dnsStart = false; + $scope.dnsStop = true; + $scope.dnsMem = Math.round(parseInt(response.data.memUsage.powerdns) / 1048576) + " MB"; + } + else { + $scope.dnsStatus = "Stopped"; + $scope.dnsStats = false; + $scope.dnsStart = true; + $scope.dnsStop = false; + } - // Update FTP stats + // Update FTP stats - if (response.data.status.pureftp) { - $scope.ftpStatus = "Running"; - $scope.ftpStats = true; - $scope.ftpStart = false; - $scope.ftpStop = true; - $scope.ftpMem = Math.round(parseInt(response.data.memUsage.pureftp) / 1048576) + " MB"; - } - else { - $scope.ftpStatus = "Stopped"; - $scope.ftpStats = false; - $scope.ftpStart = true; - $scope.ftpStop = false; - } + if (response.data.status.pureftp) { + $scope.ftpStatus = "Running"; + $scope.ftpStats = true; + $scope.ftpStart = false; + $scope.ftpStop = true; + $scope.ftpMem = Math.round(parseInt(response.data.memUsage.pureftp) / 1048576) + " MB"; + } + else { + $scope.ftpStatus = "Stopped"; + $scope.ftpStats = false; + $scope.ftpStart = true; + $scope.ftpStop = false; + } - $scope.services = true; + $scope.services = true; - $scope.btnDisable = false; + $scope.btnDisable = false; - } - function cantLoadInitialDatas(response) { - $scope.couldNotConnect = true; + } - } + function cantLoadInitialDatas(response) { + $scope.couldNotConnect = true; - }; - getServiceStatus(); + } - $scope.serviceAction = function(serviceName, action){ - $scope.ActionProgress = true; - $scope.btnDisable = true; - $scope.ActionSuccessfull = false; - $scope.ActionFailed = false; - $scope.couldNotConnect = false; - $scope.actionLoader = true; + }; + getServiceStatus(); - url = "/serverstatus/servicesAction"; + $scope.serviceAction = function (serviceName, action) { + $scope.ActionProgress = true; + $scope.btnDisable = true; + $scope.ActionSuccessfull = false; + $scope.ActionFailed = false; + $scope.couldNotConnect = false; + $scope.actionLoader = true; - var data = { - service:serviceName, - action:action - }; + url = "/serverstatus/servicesAction"; - var config = { - headers : { - 'X-CSRFToken': getCookie('csrftoken') - } - }; + var data = { + service: serviceName, + action: action + }; - $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; - function ListInitialDatas(response) { - console.log(response.data); + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); - if(response.data.serviceAction == 1){ - setTimeout(function() { - getServiceStatus(); - $scope.ActionSuccessfull = true; - $scope.ActionFailed = false; - $scope.couldNotConnect = false; - $scope.actionLoader = false; - $scope.btnDisable = false; - }, 3000); - } - else{ - setTimeout(function() { - getServiceStatus(); - $scope.ActionSuccessfull = false; - $scope.ActionFailed = true; - $scope.couldNotConnect = false; - $scope.actionLoader = false; - $scope.btnDisable = false; - }, 5000); + function ListInitialDatas(response) { + console.log(response.data); - } - - } - function cantLoadInitialDatas(response) { - $scope.ActionSuccessfull = false; + if (response.data.serviceAction == 1) { + setTimeout(function () { + getServiceStatus(); + $scope.ActionSuccessfull = true; $scope.ActionFailed = false; - $scope.couldNotConnect = true; + $scope.couldNotConnect = false; $scope.actionLoader = false; $scope.btnDisable = false; - } + }, 3000); + } + else { + setTimeout(function () { + getServiceStatus(); + $scope.ActionSuccessfull = false; + $scope.ActionFailed = true; + $scope.couldNotConnect = false; + $scope.actionLoader = false; + $scope.btnDisable = false; + }, 5000); - } + } + + } + + function cantLoadInitialDatas(response) { + $scope.ActionSuccessfull = false; + $scope.ActionFailed = false; + $scope.couldNotConnect = true; + $scope.actionLoader = false; + $scope.btnDisable = false; + } + + } }); + +app.controller('lswsSwitch', function ($scope, $http, $timeout, $window) { + + + $scope.cyberPanelLoading = true; + $scope.installBoxGen = true; + + $scope.switchTOLSWS = function () { + + $scope.cyberPanelLoading = false; + $scope.installBoxGen = true; + + url = "/serverstatus/switchTOLSWS"; + + var data = { + licenseKey: $scope.licenseKey + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + $scope.cyberPanelLoading = true; + if (response.data.status === 1) { + $scope.installBoxGen = false; + getRequestStatus(); + } + else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + } + + } + + function cantLoadInitialDatas(response) { + $scope.cyberPanelLoading = true; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page', + type: 'error' + }); + } + + }; + + function getRequestStatus() { + $scope.cyberPanelLoading = false; + + url = "/serverstatus/switchTOLSWSStatus"; + + var data = {}; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + if (response.data.abort === 0) { + $scope.requestData = response.data.requestStatus; + $timeout(getRequestStatus, 1000); + } + else { + // Notifications + $scope.cyberPanelLoading = true; + $timeout.cancel(); + $scope.requestData = response.data.requestStatus; + if (response.data.installed === 1) { + $timeout(function () { + $window.location.reload(); + }, 3000); + } + + } + } + + function cantLoadInitialDatas(response) { + $scope.cyberPanelLoading = true; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page', + type: 'error' + }); + + + } + + } + +}); \ No newline at end of file