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

bug fix: email password

Browse Source
This commit is contained in:
Usman Nasir
2019-12-16 15:48:45 +05:00
parent baad2d68f8
commit 719066b329
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mailServer/mailserverManager.py
View File

@@ -548,12 +548,12 @@ class MailServerManager:
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.decode())
emailDB.password = password emailDB.password = password
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.decode())
emailDB.password = password emailDB.password = password
emailDB.save() emailDB.save()

8
plogical/mailUtilities.py
View File

@@ -140,13 +140,13 @@ class mailUtilities:
if os.path.exists(CentOSPath): if os.path.exists(CentOSPath):
password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()) password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
password = '{CRYPT}%s' % (password) password = '{CRYPT}%s' % (password.decode())
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(password.encode('utf-8'), bcrypt.gensalt()) password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
password = '{CRYPT}%s' % (password) password = '{CRYPT}%s' % (password.decode())
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()
@@ -192,8 +192,8 @@ class mailUtilities:
CentOSPath = '/etc/redhat-release' CentOSPath = '/etc/redhat-release'
changePass = EUsers.objects.get(email=email) changePass = EUsers.objects.get(email=email)
if os.path.exists(CentOSPath): if os.path.exists(CentOSPath):
password = bcrypt.hashpw(str(newPassword), bcrypt.gensalt()) password = bcrypt.hashpw(newPassword.encode('utf-8'), bcrypt.gensalt())
password = '{CRYPT}%s' % (password) password = '{CRYPT}%s' % (password.decode())
changePass.password = password changePass.password = password
else: else:
changePass.password = newPassword changePass.password = newPassword

2
plogical/virtualHostUtilities.py
View File

@@ -246,7 +246,7 @@ class virtualHostUtilities:
'Default', '100%', '1G', '1024', '50', '1024', '1G', '20') 'Default', '100%', '1G', '1024', '50', '1024', '1G', '20')
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
command = 'sudo lvectl apply all' command = 'lvectl apply all'
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
else: else:
try: try: