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: dont update email passwords on upgrade if crypt detected

Browse Source
This commit is contained in:
Usman Nasir
2019-08-25 14:06:28 +05:00
parent a5bf6ca60a
commit dde0ab908e
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plogical/upgrade.py
View File

@@ -1583,8 +1583,10 @@ enabled=1"""
writeToFile.close() writeToFile.close()
if updatePasswords: Upgrade.stdOut("Upgrading passwords...")
for items in EUsers.objects.all(): for items in EUsers.objects.all():
if items.password.find('CRYPT') > -1:
continue
command = 'doveadm pw -p %s' % (items.password) command = 'doveadm pw -p %s' % (items.password)
items.password = subprocess.check_output(shlex.split(command)).strip('\n') items.password = subprocess.check_output(shlex.split(command)).strip('\n')
items.save() items.save()
@@ -1642,13 +1644,15 @@ enabled=1"""
writeToFile.close() writeToFile.close()
if updatePasswords:
Upgrade.stdOut("Upgrading passwords...") Upgrade.stdOut("Upgrading passwords...")
for items in EUsers.objects.all(): for items in EUsers.objects.all():
if items.password.find('CRYPT') > -1:
continue
command = 'doveadm pw -p %s' % (items.password) command = 'doveadm pw -p %s' % (items.password)
items.password = subprocess.check_output(shlex.split(command)).strip('\n') items.password = subprocess.check_output(shlex.split(command)).strip('\n')
items.save() items.save()
command = "systemctl restart dovecot" command = "systemctl restart dovecot"
Upgrade.executioner(command, 0) Upgrade.executioner(command, 0)