summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-01-26 13:04:54 -0600
committerKali Kaneko <kali@leap.se>2015-02-11 14:05:44 -0400
commitfccec727a6c949b90e7646f7fdf1dbd6931e70ba (patch)
treef56f6b72c5be0f658508ecb7f64c4570188c0d06 /mail
parent2651cb2c45094ef15b243840f0f8a4ca3168dcfd (diff)
If not signature don't fail
Diffstat (limited to 'mail')
-rw-r--r--mail/src/leap/mail/incoming/service.py2
-rw-r--r--mail/src/leap/mail/incoming/tests/test_incoming_mail.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/mail/src/leap/mail/incoming/service.py b/mail/src/leap/mail/incoming/service.py
index 0b2f7c2..23c216c 100644
--- a/mail/src/leap/mail/incoming/service.py
+++ b/mail/src/leap/mail/incoming/service.py
@@ -435,7 +435,7 @@ class IncomingMail(Service):
def add_leap_header(ret):
decrmsg, signkey = ret
- if (senderAddress is None or
+ if (senderAddress is None or signkey is None or
isinstance(signkey, keymanager_errors.KeyNotFound)):
decrmsg.add_header(
self.LEAP_SIGNATURE_HEADER,
diff --git a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
index 0745ee0..f8652b3 100644
--- a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
+++ b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
@@ -46,6 +46,8 @@ from leap.soledad.common.crypto import (
ENC_SCHEME_KEY,
)
+# TODO: add some tests for encrypted, unencrypted, signed and unsgined messages
+
class IncomingMailTestCase(TestCaseWithKeyManager):
"""