Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check SSL-Context for IMAP4_SSL connections #69

Merged
merged 4 commits into from
Jun 7, 2016
Merged

Check SSL-Context for IMAP4_SSL connections #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a0117b
According to https://github.com/martinrusev/imbox/issues/68 the
Jun 2, 2016
61ca73e
Fixed a condition
Jun 2, 2016
adfbc2f
Fix IMAP transport instantiation
bernhard-herzog Jun 2, 2016
ad085d9
Allow the user to supply a custom ssl context
bernhard-herzog Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions imbox/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@

class Imbox(object):

def __init__(self, hostname, username=None, password=None, ssl=True, port=None):
def __init__(self, hostname, username=None, password=None, ssl=True,
port=None, ssl_context=None):

self.server = ImapTransport(hostname, ssl=ssl, port=port)
self.server = ImapTransport(hostname, ssl=ssl, port=port,
ssl_context=None)
self.hostname = hostname
self.username = username
self.password = password
Expand Down
17 changes: 13 additions & 4 deletions imbox/imap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,33 @@
from imaplib import IMAP4, IMAP4_SSL

import logging
import ssl as pythonssllib

logger = logging.getLogger(__name__)


class ImapTransport(object):

def __init__(self, hostname, port=None, ssl=False):
def __init__(self, hostname, port=None, ssl=True, ssl_context=None):
self.hostname = hostname
self.port = port
kwargs = {}

if ssl:
self.transport = IMAP4_SSL
if not self.port:
self.port = 993
if ssl_context is None:
ssl_context = pythonssllib.create_default_context()
kwargs["ssl_context"] = ssl_context
else:
self.transport = IMAP4
if not self.port:
self.port = 143

self.server = self.transport(self.hostname, self.port)
logger.debug("Created IMAP4 transport for {host}:{port}".format(host=self.hostname, port=self.port))
self.server = self.transport(self.hostname, self.port, **kwargs)
logger.debug("Created IMAP4 transport for {host}:{port}"
.format(host=self.hostname, port=self.port))

def list_folders(self):
logger.debug("List all folders in mailbox")
Expand All @@ -28,5 +36,6 @@ def list_folders(self):
def connect(self, username, password):
self.server.login(username, password)
self.server.select()
logger.debug("Logged into server {} and selected mailbox 'INBOX'".format(self.hostname))
logger.debug("Logged into server {} and selected mailbox 'INBOX'"
.format(self.hostname))
return self.server