From 061d3f35a5949343ce0be95064bbf9fe4ba26ec3 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 26 Apr 2016 11:20:56 -0300 Subject: [bug] fix CHANGELOG.rst open in setup.py --- MANIFEST.in | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 1821bf4..cf9cbd3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include pkg/* include versioneer.py include LICENSE -include CHANGELOG +include CHANGELOG.rst include README.rst include src/leap/mail/_version.py diff --git a/setup.py b/setup.py index e9c3e41..960cea1 100644 --- a/setup.py +++ b/setup.py @@ -136,7 +136,7 @@ setup( maintainer_email='kali@leap.se', description='Mail Services provided by Bitmask, the LEAP Client.', long_description=open('README.rst').read() + '\n\n\n' + - open('CHANGELOG').read(), + open('CHANGELOG.rst').read(), classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, -- cgit v1.2.3 From c1efe1dfb255f155306952bd2320f56a807a5c01 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 26 Apr 2016 22:55:40 -0400 Subject: [bug] cast the identity to bytes This fixes a bug in which the tls transport complains about receiving unicode. It was only made evident by running against twisted 16. --- changes/next-changelog.rst | 13 ++----------- src/leap/mail/outgoing/service.py | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst index 9b2a9d6..11389fe 100644 --- a/changes/next-changelog.rst +++ b/changes/next-changelog.rst @@ -1,4 +1,4 @@ -0.4.1 - xxx +0.4.2 - xxx +++++++++++++++++++++++++++++++ Please add lines to this file, they will be moved to the CHANGELOG.rst during @@ -10,21 +10,12 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff. Features ~~~~~~~~ -- `#7656 `_: Emit multi-user aware events. -- `#4008 `_: Add token-based authentication to local IMAP/SMTP services. -- `#7889 `_: Use cryptography instead of pycryptopp to reduce dependencies. -- `#7263 `_: Implement local bounces to notify user of SMTP delivery errors. -- Use twisted.cred to authenticate IMAP users. - - `#1234 `_: Description of the new feature corresponding with issue #1234. - New feature without related issue number. Bugfixes ~~~~~~~~ -- `#7861 `_: Use the right succeed function for passthrough encrypted email. -- `#7898 `_: Fix IMAP fetch headers -- `#7977 `_: Decode attached keys so they are recognized by keymanager. -- Fix the get_body logic for corner-cases in which body is None (yet-to-be synced docs, mainly). +- Cast local identity (version string) to bytes, avoid TLS transport raising exception. - `#1235 `_: Description for the fixed stuff corresponding with issue #1235. - Bugfix without related issue number. diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py index 335cae4..95d3e79 100644 --- a/src/leap/mail/outgoing/service.py +++ b/src/leap/mail/outgoing/service.py @@ -224,7 +224,7 @@ class OutgoingMail(object): heloFallback=True, requireAuthentication=False, requireTransportSecurity=True) - factory.domain = __version__ + factory.domain = bytes('leap.mail-' + __version__) emit_async(catalog.SMTP_SEND_MESSAGE_START, self._from_address, recipient.dest.addrstr) reactor.connectSSL( -- cgit v1.2.3 From 3e33718164d91bb281c7d70b82c178a147f7cc39 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 11 May 2016 13:50:25 -0400 Subject: [bug] Allow pixelated integration not to interfere with thunderbird One of the pixelated adaptors was trying to access a non-existing attribute in HashableMailbox, which for some reason was blocking the operation of the imap server (uncatched exception in listeners call maybe). adding an attribute skips this error and therefore allows seamless use of both pixelated and thunderbird user agents at the same time. Resolves: #8083 --- changes/next-changelog.rst | 1 + src/leap/mail/imap/mailbox.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst index 11389fe..985e92a 100644 --- a/changes/next-changelog.rst +++ b/changes/next-changelog.rst @@ -15,6 +15,7 @@ Features Bugfixes ~~~~~~~~ +- `#8083 `_: Allow pixelated UA not interfere with Thunderbird operation. - Cast local identity (version string) to bytes, avoid TLS transport raising exception. - `#1235 `_: Description for the fixed stuff corresponding with issue #1235. diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py index d545c00..e70a1d8 100644 --- a/src/leap/mail/imap/mailbox.py +++ b/src/leap/mail/imap/mailbox.py @@ -91,6 +91,9 @@ def make_collection_listener(mailbox): def __init__(self, mbox): self.mbox = mbox + # See #8083, pixelated adaptor seems to be misusing this class. + self.mailbox_name = self.mbox.mbox_name + def __hash__(self): return hash(self.mbox.mbox_name) -- cgit v1.2.3