summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-10-28 18:52:34 +0100
committerRuben Pollan <meskio@sindominio.net>2015-11-23 17:13:33 +0100
commit6fd862abc9e8711bd4aa117697c5df85cf6f560a (patch)
tree6a31b4ecd4bff0333c16cf9377e29c5e869ec856 /src/leap
parentebc748d6dbe366d82e601c94f4191718b310bfae (diff)
[feat] add '@deliver.local' to uuid
- Resolves: #5959
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/mx/alias_resolver.py3
-rw-r--r--src/leap/mx/mail_receiver.py4
-rw-r--r--src/leap/mx/tests/test_mail_receiver.py7
3 files changed, 8 insertions, 6 deletions
diff --git a/src/leap/mx/alias_resolver.py b/src/leap/mx/alias_resolver.py
index bf7a58b..a5b5107 100644
--- a/src/leap/mx/alias_resolver.py
+++ b/src/leap/mx/alias_resolver.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
# alias_resolver.py
-# Copyright (C) 2013 LEAP
+# Copyright (C) 2013, 2015 LEAP
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ class LEAPPostfixTCPMapAliasServer(postfix.PostfixTCPMapServer):
TCP_MAP_CODE_PERMANENT_FAILURE,
postfix.quote("NOT FOUND SRY"))
else:
+ uuid += "@deliver.local"
# properly encode uuid, otherwise twisted complains when replying
if isinstance(uuid, unicode):
uuid = uuid.encode("utf8")
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py
index a9344c3..ea13658 100644
--- a/src/leap/mx/mail_receiver.py
+++ b/src/leap/mx/mail_receiver.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
# mail_receiver.py
-# Copyright (C) 2013 LEAP
+# Copyright (C) 2013, 2015 LEAP
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -269,7 +269,7 @@ class MailReceiver(Service):
return None
final_address = delivereds.pop(0)
_, addr = email.utils.parseaddr(final_address)
- uuid, _ = addr.split("@")
+ uuid = addr.split("@")[0]
return uuid
@defer.inlineCallbacks
diff --git a/src/leap/mx/tests/test_mail_receiver.py b/src/leap/mx/tests/test_mail_receiver.py
index 3eeafbd..e72cb1a 100644
--- a/src/leap/mx/tests/test_mail_receiver.py
+++ b/src/leap/mx/tests/test_mail_receiver.py
@@ -37,6 +37,7 @@ from leap.mx.mail_receiver import MailReceiver
BOUNCE_ADDRESS = "bounce@leap.se"
BOUNCE_SUBJECT = "bounce subject"
ADDRESS = "leap@leap.se"
+UUID = "13d5203bdd09be1e638bdb1d315251cb"
class MailReceiverTestCase(unittest.TestCase):
@@ -78,8 +79,7 @@ class MailReceiverTestCase(unittest.TestCase):
def test_single_mail(self):
msg, path = self.addMail("foo bar")
uuid, doc = yield self.defer_put_doc
- orig_uuid = ADDRESS.split('@')[0]
- self.assertEqual(uuid, orig_uuid)
+ self.assertEqual(uuid, UUID)
decmsg = self.decryptDoc(doc)
self.assertEqual(msg, decmsg)
self.assertFalse(os.path.exists(path))
@@ -101,7 +101,8 @@ class MailReceiverTestCase(unittest.TestCase):
frm="someone@domain.org", subject="sent subject"):
msg = Message()
msg.add_header("To", to)
- msg.add_header("Delivered-To", to)
+ msg.add_header(
+ "Delivered-To", UUID + "@deliver.local")
msg.add_header("From", frm)
msg.add_header("Subject", subject)
msg.set_payload(body)