diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-09-11 11:43:31 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2015-09-11 11:43:31 +0200 |
| commit | 5f2f8a65aba2672ae6661052af2f735ba17ad7a5 (patch) | |
| tree | 928840a56258767619f0f488b8f13b05f8aebc68 | |
| parent | b988fcb56a2548e114f6bbcb3bb43bdfb5f61fdc (diff) | |
[feat] Don't add any X-Leap-Provenance header
- Resolves: #7439
| -rw-r--r-- | changes/feature_7439_remove_provenance | 1 | ||||
| -rw-r--r-- | src/leap/mx/mail_receiver.py | 10 | ||||
| -rw-r--r-- | src/leap/mx/tests/tester.py (renamed from src/leap/mx/tester.py) | 0 |
3 files changed, 1 insertions, 10 deletions
diff --git a/changes/feature_7439_remove_provenance b/changes/feature_7439_remove_provenance new file mode 100644 index 0000000..188b9a2 --- /dev/null +++ b/changes/feature_7439_remove_provenance @@ -0,0 +1 @@ +- Don't add X-Leap-Provenance header (Closes: #7439) diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index 446fd38..697bd13 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -203,16 +203,6 @@ class MailReceiver(Service): with openpgp.TempGPGWrapper(gpgbinary='/usr/bin/gpg') as gpg: gpg.import_keys(pubkey) key = gpg.list_keys().pop() - - # add X-Leap-Provenance header if message is not encrypted - if message.get_content_type() != 'multipart/encrypted' and \ - '-----BEGIN PGP MESSAGE-----' not in \ - message_as_string: - message.add_header( - 'X-Leap-Provenance', - email.utils.formatdate(), - pubkey=key["keyid"]) - data = {'incoming': True, 'content': message.as_string()} doc.content = { self.INCOMING_KEY: True, self.ERROR_DECRYPTING_KEY: False, diff --git a/src/leap/mx/tester.py b/src/leap/mx/tests/tester.py index 05d2d05..05d2d05 100644 --- a/src/leap/mx/tester.py +++ b/src/leap/mx/tests/tester.py |