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

bug fix: backup creation

Browse Source
This commit is contained in:
Usman Nasir
2021-11-16 18:06:04 +05:00
parent 7f2bbd84b4
commit c563325796
4 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plogical/processUtilities.py
View File

@@ -102,17 +102,29 @@ class ProcessUtilities(multi.Thread):
logging.writeToFile(str(msg) + "[stopLitespeed]")
@staticmethod
def normalExecutioner(command, shell=False):
def normalExecutioner(command, shell=False, User=None):
try:
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(command)
f = open(os.devnull, 'w')
if shell == False:
res = subprocess.call(shlex.split(command), stdout=f, stderr=f)
if User == None:
if shell == False:
res = subprocess.call(shlex.split(command), stdout=f, stderr=f)
else:
res = subprocess.call(command, shell=shell, stdout=f, stderr=f)
else:
res = subprocess.call(command, shell=shell, stdout=f, stderr=f)
if command.find('export') > -1:
pass
elif command.find('sudo') == -1:
command = 'sudo -u %s %s' % (User, command)
if shell == False:
res = subprocess.call(shlex.split(command), stdout=f, stderr=f)
else:
res = subprocess.call(command, shell=shell, stdout=f, stderr=f)
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(command)
if res == 0:
return 1
@@ -254,7 +266,7 @@ class ProcessUtilities(multi.Thread):
def executioner(command, user=None, shell=False):
try:
if getpass.getuser() == 'root':
ProcessUtilities.normalExecutioner(command, shell)
ProcessUtilities.normalExecutioner(command, shell, user)
return 1
ret = ProcessUtilities.sendCommand(command, user)