bug fix: restore email password

usmannasir · Dec 16, 2019 · 4714666 · 4714666
2 parents 6c477c0 + d8cd429
commit 4714666
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py
@@ -695,7 +695,7 @@ def startRestore(backupName, dir):
                     username = email.split("@")[0]
                     password = emailAccount.find('password').text
 
-                    result = mailUtilities.createEmailAccount(masterDomain, username, password)
+                    result = mailUtilities.createEmailAccount(masterDomain, username, password, 'restore')
                     if result[0] == 0:
                         raise BaseException(result[1])
 

diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py
@@ -56,7 +56,7 @@ def AfterEffects(domain):
         ProcessUtilities.normalExecutioner(command)
 
     @staticmethod
-    def createEmailAccount(domain, userName, password):
+    def createEmailAccount(domain, userName, password, restore = None):
         try:
 
             ## Check if already exists
@@ -139,14 +139,16 @@ def createEmailAccount(domain, userName, password):
             CentOSPath = '/etc/redhat-release'
 
             if os.path.exists(CentOSPath):
-                password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
+                if restore == None:
-                password = '{CRYPT}%s' % (password.decode())
+                    password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
+                    password = '{CRYPT}%s' % (password.decode())
                 emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password)
                 emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName)
                 emailAcct.save()
             else:
-                password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
+                if restore == None:
-                password = '{CRYPT}%s' % (password.decode())
+                    password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
+                    password = '{CRYPT}%s' % (password.decode())
                 emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password)
                 emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName)
                 emailAcct.save()