mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-09 22:38:19 +02:00
Code Activity

add imaps STARTTLS support using +tls

Browse source
This commit is contained in:
Steeve Chailloux 2016-05-01 19:52:34 +02:00
parent 71fcaa2ede
commit 0ee5efede9
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
django_mailbox/models.py
View file

@ -193,6 +193,11 @@ class Mailbox(models.Model):
"""Returns whether or not this mailbox's connection uses SSL.""" """Returns whether or not this mailbox's connection uses SSL."""
return '+ssl' in self._protocol_info.scheme.lower() return '+ssl' in self._protocol_info.scheme.lower()
@property
def use_tls(self):
"""Returns whether or not this mailbox's connection uses STARTTLS."""
return '+tls' in self._protocol_info.scheme.lower()
@property @property
def archive(self): def archive(self):
"""Returns (if specified) the folder to archive messages to.""" """Returns (if specified) the folder to archive messages to."""
@ -223,6 +228,7 @@ class Mailbox(models.Model):
self.location, self.location,
port=self.port if self.port else None, port=self.port if self.port else None,
ssl=self.use_ssl, ssl=self.use_ssl,
tls=self.use_tls,
archive=self.archive, archive=self.archive,
folder=self.folder folder=self.folder
) )

6
django_mailbox/transports/imap.py
View file

@ -18,7 +18,8 @@ logger = logging.getLogger(__name__)
class ImapTransport(EmailTransport): class ImapTransport(EmailTransport):
def __init__( def __init__(
self, hostname, port=None, ssl=False, archive='', folder=None self, hostname, port=None, ssl=False, tls=False,
archive='', folder=None,
): ):
self.max_message_size = getattr( self.max_message_size = getattr(
settings, settings,
@ -34,6 +35,7 @@ class ImapTransport(EmailTransport):
self.port = port self.port = port
self.archive = archive self.archive = archive
self.folder = folder self.folder = folder
self.tls = tls
if ssl: if ssl:
self.transport = imaplib.IMAP4_SSL self.transport = imaplib.IMAP4_SSL
if not self.port: if not self.port:
@ -45,6 +47,8 @@ class ImapTransport(EmailTransport):
def connect(self, username, password): def connect(self, username, password):
self.server = self.transport(self.hostname, self.port) self.server = self.transport(self.hostname, self.port)
if self.tls:
self.server.starttls()
typ, msg = self.server.login(username, password) typ, msg = self.server.login(username, password)
if self.folder: if self.folder: