Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-15 17:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: emails

Browse Source
This commit is contained in:
Usman Nasir
2019-12-16 11:53:58 +05:00
parent 92d7636602
commit fa380021dd
4 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plogical/CyberCPLogFileWriter.py
View File

@@ -13,7 +13,7 @@ class CyberCPLogFileWriter:
"%m.%d.%Y_%H-%M-%S") + "] "+ message + "\n") "%m.%d.%Y_%H-%M-%S") + "] "+ message + "\n")
file.close() file.close()
except IOError as msg: except BaseException as msg:
return "Can not write to error file." return "Can not write to error file."
@staticmethod @staticmethod
@@ -24,7 +24,7 @@ class CyberCPLogFileWriter:
"%m.%d.%Y_%H-%M-%S") + "] [" + level + ":" + method + "] " + message + "\n") "%m.%d.%Y_%H-%M-%S") + "] [" + level + ":" + method + "] " + message + "\n")
file.close() file.close()
file.close() file.close()
except IOError: except BaseException:
return "Can not write to error file!" return "Can not write to error file!"
@staticmethod @staticmethod

7
plogical/mailUtilities.py
View File

@@ -134,21 +134,18 @@ class mailUtilities:
emailDomain = Domains.objects.get(domain=domain) emailDomain = Domains.objects.get(domain=domain)
hash = hashlib.md5()
hash.update(password)
#emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=hash.hexdigest()) #emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=hash.hexdigest())
CentOSPath = '/etc/redhat-release' CentOSPath = '/etc/redhat-release'
if os.path.exists(CentOSPath): if os.path.exists(CentOSPath):
password = bcrypt.hashpw(str(password), bcrypt.gensalt()) password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
password = '{CRYPT}%s' % (password) password = '{CRYPT}%s' % (password)
emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password) emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password)
emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName) emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName)
emailAcct.save() emailAcct.save()
else: else:
password = bcrypt.hashpw(str(password), bcrypt.gensalt()) password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
password = '{CRYPT}%s' % (password) password = '{CRYPT}%s' % (password)
emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password) emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password)
emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName) emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName)

19
plogical/processUtilities.py
View File

@@ -188,25 +188,22 @@ class ProcessUtilities(multi.Thread):
sock.sendall(command.encode('utf-8')) sock.sendall(command.encode('utf-8'))
data = "" data = ""
dataSTR = ""
while (1): while (1):
currentData = sock.recv(32) currentData = sock.recv(32)
if len(currentData) == 0 or currentData == None: if len(currentData) == 0 or currentData == None:
break break
try: try:
data = data + currentData.decode(encoding = 'UTF-8',errors = 'ignore') data = data + currentData.decode(errors = 'ignore')
except BaseException as msg: except BaseException as msg:
logging.writeToFile('Some data could not be decoded to str, error message: %s' % str(msg)) logging.writeToFile('Some data could not be decoded to str, error message: %s' % str(msg))
dataSTR = dataSTR + str(currentData)
sock.close() sock.close()
logging.writeToFile('Final data: %s.' % (dataSTR)) logging.writeToFile('Final data: %s.' % (str(data)))
return data, dataSTR
return data
except BaseException as msg: except BaseException as msg:
logging.writeToFile(str(msg) + " [sendCommand]") logging.writeToFile(str(msg) + " [hey:sendCommand]")
return "0" + str(msg) return "0" + str(msg)
@staticmethod @staticmethod
@@ -216,7 +213,7 @@ class ProcessUtilities(multi.Thread):
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
return 1 return 1
ret, dataSTR = ProcessUtilities.sendCommand(command, user) ret = ProcessUtilities.sendCommand(command, user)
exitCode = ret[len(ret) -1] exitCode = ret[len(ret) -1]
exitCode = int(codecs.encode(exitCode.encode(), 'hex')) exitCode = int(codecs.encode(exitCode.encode(), 'hex'))
@@ -238,8 +235,8 @@ class ProcessUtilities(multi.Thread):
if type(command) == list: if type(command) == list:
command = " ".join(command) command = " ".join(command)
data, dataSTR = ProcessUtilities.sendCommand(command, user)
return dataSTR[:-1] return ProcessUtilities.sendCommand(command, user)[:-1]
except BaseException as msg: except BaseException as msg:
logging.writeToFile(str(msg) + "[outputExecutioner:188]") logging.writeToFile(str(msg) + "[outputExecutioner:188]")

4
plogical/test.py
View File

@@ -1,4 +0,0 @@
import subprocess
import shlex
print(subprocess.check_output(shlex.split('ls -la')).decode("utf-8"))