diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-26 22:55:40 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-26 23:03:27 -0400 |
| commit | 983d18e6a94e60c0f641ac332038b875ea685433 (patch) | |
| tree | 06405735b61d8ba9316ee5886811b565068b43dc | |
| parent | 84ceab1abb1863906b51f4b78885aa99c66bafc4 (diff) | |
[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.
| -rw-r--r-- | mail/changes/next-changelog.rst | 13 | ||||
| -rw-r--r-- | mail/src/leap/mail/outgoing/service.py | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/mail/changes/next-changelog.rst b/mail/changes/next-changelog.rst index 9b2a9d6..11389fe 100644 --- a/mail/changes/next-changelog.rst +++ b/mail/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 <https://leap.se/code/issues/7656>`_: Emit multi-user aware events. -- `#4008 <https://leap.se/code/issues/4008>`_: Add token-based authentication to local IMAP/SMTP services. -- `#7889 <https://leap.se/code/issues/7889>`_: Use cryptography instead of pycryptopp to reduce dependencies. -- `#7263 <https://leap.se/code/issues/7263>`_: Implement local bounces to notify user of SMTP delivery errors. -- Use twisted.cred to authenticate IMAP users. - - `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234. - New feature without related issue number. Bugfixes ~~~~~~~~ -- `#7861 <https://leap.se/code/issues/7861>`_: Use the right succeed function for passthrough encrypted email. -- `#7898 <https://leap.se/code/issues/7898>`_: Fix IMAP fetch headers -- `#7977 <https://leap.se/code/issues/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 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235. - Bugfix without related issue number. diff --git a/mail/src/leap/mail/outgoing/service.py b/mail/src/leap/mail/outgoing/service.py index 335cae4..95d3e79 100644 --- a/mail/src/leap/mail/outgoing/service.py +++ b/mail/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( |