diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/changes/feature-4692_remove_footer | 1 | ||||
| -rw-r--r-- | mail/src/leap/mail/outgoing/service.py | 13 | ||||
| -rw-r--r-- | mail/src/leap/mail/outgoing/tests/test_outgoing.py | 4 |
3 files changed, 2 insertions, 16 deletions
diff --git a/mail/changes/feature-4692_remove_footer b/mail/changes/feature-4692_remove_footer new file mode 100644 index 00000000..8eca8837 --- /dev/null +++ b/mail/changes/feature-4692_remove_footer @@ -0,0 +1 @@ +- Don't add any footer to the emails (Closes: #4692) diff --git a/mail/src/leap/mail/outgoing/service.py b/mail/src/leap/mail/outgoing/service.py index b70b3b10..88b8895e 100644 --- a/mail/src/leap/mail/outgoing/service.py +++ b/mail/src/leap/mail/outgoing/service.py @@ -67,8 +67,6 @@ class OutgoingMail: A service for handling encrypted outgoing mail. """ - FOOTER_STRING = "I prefer encrypted email" - def __init__(self, from_address, keymanager, cert, key, host, port): """ Initialize the mail service. @@ -220,7 +218,6 @@ class OutgoingMail: :rtype: Deferred """ # pass if the original message's content-type is "multipart/encrypted" - lines = raw.split('\r\n') origmsg = Parser().parsestr(raw) if origmsg.get_content_type() == 'multipart/encrypted': @@ -230,16 +227,6 @@ class OutgoingMail: username, domain = from_address.split('@') to_address = validate_address(recipient.dest.addrstr) - # add a nice footer to the outgoing message - # XXX: footer will eventually optional or be removed - if origmsg.get_content_type() == 'text/plain': - lines.append('--') - lines.append('%s - https://%s/key/%s' % - (self.FOOTER_STRING, domain, username)) - lines.append('') - - origmsg = Parser().parsestr('\r\n'.join(lines)) - def signal_encrypt_sign(newmsg): signal(proto.SMTP_END_ENCRYPT_AND_SIGN, "%s,%s" % (self._from_address, to_address)) diff --git a/mail/src/leap/mail/outgoing/tests/test_outgoing.py b/mail/src/leap/mail/outgoing/tests/test_outgoing.py index fa50c305..d7423b69 100644 --- a/mail/src/leap/mail/outgoing/tests/test_outgoing.py +++ b/mail/src/leap/mail/outgoing/tests/test_outgoing.py @@ -58,9 +58,7 @@ class TestOutgoingMail(TestCaseWithKeyManager): self.lines = [line for line in self.EMAIL_DATA[4:12]] self.lines.append('') # add a trailing newline self.raw = '\r\n'.join(self.lines) - self.expected_body = ('\r\n'.join(self.EMAIL_DATA[9:12]) + - "\r\n\r\n--\r\nI prefer encrypted email - " - "https://leap.se/key/anotheruser\r\n") + self.expected_body = '\r\n'.join(self.EMAIL_DATA[9:12]) + "\r\n" self.fromAddr = ADDRESS_2 def init_outgoing_and_proto(_): |