pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not use SSL for email if using TLS

Browse Source
This commit is contained in:
dandds 2018-10-12 10:50:34 -04:00
parent df35725430
commit 4b8c017d49
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
atst/utils/mailer.py
View File

@ -12,9 +12,11 @@ class _HostConnection:
self.host = None self.host = None
def __enter__(self): def __enter__(self):
self.host = smtplib.SMTP_SSL(self.server, self.port)
if self.use_tls: if self.use_tls:
self.host = smtplib.SMTP(self.server, self.port)
self.host.starttls() self.host.starttls()
else:
self.host = smtplib.SMTP_SSL(self.server, self.port)
self.host.login(self.username, self.password) self.host.login(self.username, self.password)
return self.host return self.host
@ -31,6 +33,7 @@ class BaseMailer:
self.sender = sender self.sender = sender
self.password = password self.password = password
self.use_tls = use_tls self.use_tls = use_tls
self.messages = []
def _message(self, recipients, subject, body): def _message(self, recipients, subject, body):
msg = EmailMessage() msg = EmailMessage()
@ -47,7 +50,7 @@ class BaseMailer:
class Mailer(BaseMailer): class Mailer(BaseMailer):
def connection(self): def connection(self):
return _HostConnection(self.server, self.port, self.sender, self.password) return _HostConnection(self.server, self.port, self.sender, self.password, use_tls=self.use_tls)
def send(self, recipients, subject, body): def send(self, recipients, subject, body):
message = self._message(recipients, subject, body) message = self._message(recipients, subject, body)