Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-08-29 15:27:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes.

Browse Source
This commit is contained in:
usmannasir
2018-07-05 15:22:48 +05:00
parent 27c31b522d
commit e952a6dc5d
30 changed files with 236 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plogical/backupUtilities.py
View File

@@ -31,7 +31,7 @@ from backup.models import DBUsers
from mailServer.models import Domains as eDomains
from random import randint
import time
from plogical.mailUtilities import mailUtilities
## I am not the monster that you think I am..
@@ -614,21 +614,9 @@ class backupUtilities:
username = email.split("@")[0]
password = emailAccount.find('password').text
finalData = json.dumps({'domain': masterDomain, 'username': username, 'password': password})
r = requests.post("http://localhost:5003/email/submitEmailCreation", data=finalData,verify=False)
data = json.loads(r.text)
if data['createEmailStatus'] == 1:
continue
else:
status = open(os.path.join(completPath,'status'), "w")
status.write("Error Message: " + data[
'error_message'] + ". Not able to create email accounts, aborting. [5009]")
status.close()
return 0
result = mailUtilities.createEmailAccount(masterDomain, username, password)
if result[0] == 0:
raise BaseException(result[1])
except BaseException, msg:
status = open(os.path.join(completPath,'status'), "w")

95
plogical/vhost.py
View File

@@ -309,7 +309,6 @@ class vhost:
## File Manager defination
context = "context /.filemanager {\n"
type = " type NULL\n"
location = " location /usr/local/lsws/Example/html/FileManager\n"
allowBrowse = " allowBrowse 1\n"
autoIndex = " autoIndex 1\n\n"
@@ -319,8 +318,17 @@ class vhost:
deny = " deny 0.0.0.0/0\n"
accessControlEnds = " }\n"
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"
@@ -328,7 +336,6 @@ class vhost:
contextEnds = "}\n"
confFile.writelines(context)
confFile.writelines(type)
confFile.writelines(location)
confFile.writelines(allowBrowse)
confFile.writelines(autoIndex)
@@ -336,10 +343,16 @@ class vhost:
confFile.writelines(allow)
confFile.writelines(deny)
confFile.writelines(accessControlEnds)
confFile.write(rewriteInherit)
confFile.writelines(phpIniOverride)
if openBasedir == 1:
confFile.writelines(phpIniOverride)
confFile.writelines(php_admin_value)
confFile.writelines(endPHPIniOverride)
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)
@@ -349,10 +362,26 @@ class vhost:
php_admin_value = 'php_admin_value open_basedir "/tmp:$VH_ROOT"\n'
endPHPIniOverride = "}\n"
confFile.writelines(phpIniOverride)
if openBasedir == 1:
confFile.writelines(phpIniOverride)
confFile.writelines(php_admin_value)
confFile.writelines(endPHPIniOverride)
confFile.writelines(endPHPIniOverride)
slashContext = """
context / {
location $DOC_ROOT/
allowBrowse 1
rewrite {
enable 1
RewriteFile .htaccess
}
addDefaultCharset off
}
"""
confFile.write(slashContext)
confFile.close()
@@ -584,40 +613,7 @@ class vhost:
def addRewriteRules(virtualHostName, fileName=None):
try:
path = vhost.Server_root + "/conf/vhosts/" + virtualHostName + "/vhost.conf"
data = open(path, "r").readlines()
if fileName == None:
dataToWritten = "rewriteFile /home/" + virtualHostName + "/public_html/.htaccess" + "\n"
else:
dataToWritten = "rewriteFile " + fileName + "\n"
### Data if re-writes are not already enabled
rewrite = "rewrite {\n"
enables = " enable 1\n"
rules = " rules <<<END_rules\n"
endRules = " END_rules\n"
end = "}\n\n"
if vhost.checkIfRewriteEnabled(data) == 1:
pass
else:
writeDataToFile = open(path, "a")
writeDataToFile.writelines("\n")
writeDataToFile.writelines("\n")
writeDataToFile.writelines(rewrite)
writeDataToFile.writelines(enables)
writeDataToFile.writelines(rules)
writeDataToFile.writelines(dataToWritten)
writeDataToFile.writelines(endRules)
writeDataToFile.writelines(end)
writeDataToFile.close()
pass
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with per host config file [changePHP]]")
return 0
@@ -898,10 +894,10 @@ class vhost:
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(phpIniOverride)
confFile.writelines(php_admin_value)
confFile.writelines(endPHPIniOverride)
confFile.writelines(endPHPIniOverride)
# php settings
@@ -972,6 +968,21 @@ class vhost:
confFile.writelines(procHardLimit)
confFile.writelines(extprocessorEnd)
slashContext = """
context / {
location $DOC_ROOT/
allowBrowse 1
rewrite {
enable 1
RewriteFile .htaccess
}
addDefaultCharset off
}
"""
confFile.write(slashContext)
confFile.close()
except BaseException, msg:

53
plogical/virtualHostUtilities.py
View File

@@ -832,54 +832,43 @@ class virtualHostUtilities:
completePathToConfigFile = confPath + "/vhost.conf"
data = open(completePathToConfigFile, 'r').readlines()
skip = 0
if openBasedirValue == 'Disable':
writeToFile = open(completePathToConfigFile, 'w')
for items in data:
if items.find('phpIniOverride') > -1:
skip = 1
if skip == 1 and items.find('}') > -1:
skip = 0
if items.find('php_admin_value') > -1:
continue
if skip == 1:
continue
writeToFile.writelines(items)
writeToFile.close()
else:
## Check if phpini already active
inistatus = 0
fileManagerCheck = 0
writeToFile = open(completePathToConfigFile, 'w')
for items in data:
if items.find('context /.filemanager') > -1:
writeToFile.writelines(items)
fileManagerCheck = 1
continue
if items.find('phpIniOverride') > -1:
inistatus = 1
if inistatus == 0:
writeToFile = open(completePathToConfigFile, 'w')
for items in data:
if items.find('context /.filemanager') > -1:
writeToFile.writelines(items)
phpIniOverride = "phpIniOverride {\n"
php_admin_value = 'php_admin_value open_basedir "/tmp:/usr/local/lsws/Example/html/FileManager:$VH_ROOT"\n'
endPHPIniOverride = "}\n"
writeToFile.writelines(phpIniOverride)
writeToFile.writelines(php_admin_value)
writeToFile.writelines(endPHPIniOverride)
writeToFile.writelines(items)
if fileManagerCheck == 1:
writeToFile.writelines('php_admin_value open_basedir "/tmp:/usr/local/lsws/Example/html/FileManager:$VH_ROOT"\n')
fileManagerCheck = 0
continue
else:
writeToFile.writelines(items)
writeToFile.writelines('php_admin_value open_basedir "/tmp:$VH_ROOT"\n')
continue
phpIniOverride = "\nphpIniOverride {\n"
php_admin_value = 'php_admin_value open_basedir "/tmp:$VH_ROOT"\n'
endPHPIniOverride = "}\n"
writeToFile.writelines(items)
writeToFile.writelines(phpIniOverride)
writeToFile.writelines(php_admin_value)
writeToFile.writelines(endPHPIniOverride)
writeToFile.close()
writeToFile.close()
installUtilities.installUtilities.reStartLiteSpeed()
print "1,None"