From 6043b5281695536a418d548f3d36c93abe597e3c Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 24 Jul 2020 19:00:51 +0500 Subject: [PATCH 1/4] initiate starttls if port 586 --- emailMarketing/emailMarketing.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py index 0cac55f82..9a0460c93 100755 --- a/emailMarketing/emailMarketing.py +++ b/emailMarketing/emailMarketing.py @@ -279,6 +279,10 @@ class emailMarketing(multi.Thread): else: self.verifyHost = SMTPHosts.objects.get(host=self.extraArgs['host']) self.smtpServer = smtplib.SMTP(str(self.verifyHost.host), int(self.verifyHost.port)) + + if int(self.verifyHost.port) == 587: + self.smtpServer.starttls() + self.smtpServer.login(str(self.verifyHost.userName), str(self.verifyHost.password)) return 1 except smtplib.SMTPHeloError: From 1d135b60f075fe834ac219cfd8712382c6ed00cf Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 24 Jul 2020 19:24:25 +0500 Subject: [PATCH 2/4] fix a minor upgrade bug if on dev branch --- plogical/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 33ce9c40d..019ca03db 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1439,7 +1439,7 @@ class Upgrade: command = 'git status' currentBranch = subprocess.check_output(shlex.split(command)).decode() - if currentBranch.find('On branch %s' % (branch)) > -1: + if currentBranch.find('On branch %s' % (branch)) > -1 and currentBranch.find('On branch %s-dev' % (branch)) == -1: command = 'git stash' Upgrade.executioner(command, command, 1) From 2928ea878e18cba9acbe7c37a889513dd9766122 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 24 Jul 2020 19:50:50 +0500 Subject: [PATCH 3/4] initiate starttls if port 587 --- emailMarketing/emailMarketingManager.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/emailMarketing/emailMarketingManager.py b/emailMarketing/emailMarketingManager.py index b77d2a7aa..ef2061be9 100755 --- a/emailMarketing/emailMarketingManager.py +++ b/emailMarketing/emailMarketingManager.py @@ -517,6 +517,10 @@ class EmailMarketingManager: try: verifyLogin = smtplib.SMTP(str(smtpHost), int(smtpPort)) + + if int(smtpPort) == 587: + verifyLogin.starttls() + verifyLogin.login(str(smtpUserName), str(smtpPassword)) admin = Administrator.objects.get(pk=userID) @@ -618,6 +622,10 @@ class EmailMarketingManager: try: verifyHost = SMTPHosts.objects.get(id=id) verifyLogin = smtplib.SMTP(str(verifyHost.host), int(verifyHost.port)) + + if int(verifyHost.port) == 587: + verifyLogin.starttls() + verifyLogin.login(str(verifyHost.userName), str(verifyHost.password)) data_ret = {"status": 1, 'message': 'Login successful.'} From 5fb8bbe489c69be4ccda6932ab0d5cdf700ba94e Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 24 Jul 2020 22:47:23 +0500 Subject: [PATCH 4/4] fix permissions after move --- filemanager/filemanager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/filemanager/filemanager.py b/filemanager/filemanager.py index 15fe31caa..3386f34f3 100755 --- a/filemanager/filemanager.py +++ b/filemanager/filemanager.py @@ -258,6 +258,8 @@ class FileManager: self.changeOwner(self.data['newPath']) + self.fixPermissions(domainName) + json_data = json.dumps(finalData) return HttpResponse(json_data)