From 5f2f8a65aba2672ae6661052af2f735ba17ad7a5 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Fri, 11 Sep 2015 11:43:31 +0200
Subject: [feat] Don't add any X-Leap-Provenance header

- Resolves: #7439
---
 changes/feature_7439_remove_provenance |  1 +
 src/leap/mx/mail_receiver.py           | 10 --------
 src/leap/mx/tester.py                  | 46 ----------------------------------
 src/leap/mx/tests/tester.py            | 46 ++++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 56 deletions(-)
 create mode 100644 changes/feature_7439_remove_provenance
 delete mode 100644 src/leap/mx/tester.py
 create mode 100644 src/leap/mx/tests/tester.py

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/tester.py
deleted file mode 100644
index 05d2d05..0000000
--- a/src/leap/mx/tester.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import ConfigParser
-import sys
-import os
-
-from twisted.internet import reactor, defer
-from twisted.python import filepath, log
-
-from leap.mx import couchdbhelper
-from leap.mx.mail_receiver import MailReceiver
-
-if __name__ == "__main__":
-    log.startLogging(sys.stdout)
-    fullpath = os.path.realpath(sys.argv[1])
-
-    log.msg("Starting test for %s..." % (fullpath,))
-
-    config_file = "/etc/leap/mx.conf"
-
-    config = ConfigParser.ConfigParser()
-    config.read(config_file)
-
-    user = config.get("couchdb", "user")
-    password = config.get("couchdb", "password")
-
-    server = config.get("couchdb", "server")
-    port = config.get("couchdb", "port")
-
-    cdb = couchdbhelper.ConnectedCouchDB(server,
-                                         port=port,
-                                         dbName="identities",
-                                         username=user,
-                                         password=password)
-
-    # Mail receiver
-    mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user,
-                                                    password,
-                                                    server,
-                                                    port)
-
-    mr = MailReceiver(mail_couch_url_prefix, cdb, [])
-    fpath = filepath.FilePath(fullpath)
-
-    d = mr._process_incoming_email(None, fpath, 0)
-    d.addCallback(lambda x: reactor.stop())
-
-    reactor.run()
diff --git a/src/leap/mx/tests/tester.py b/src/leap/mx/tests/tester.py
new file mode 100644
index 0000000..05d2d05
--- /dev/null
+++ b/src/leap/mx/tests/tester.py
@@ -0,0 +1,46 @@
+import ConfigParser
+import sys
+import os
+
+from twisted.internet import reactor, defer
+from twisted.python import filepath, log
+
+from leap.mx import couchdbhelper
+from leap.mx.mail_receiver import MailReceiver
+
+if __name__ == "__main__":
+    log.startLogging(sys.stdout)
+    fullpath = os.path.realpath(sys.argv[1])
+
+    log.msg("Starting test for %s..." % (fullpath,))
+
+    config_file = "/etc/leap/mx.conf"
+
+    config = ConfigParser.ConfigParser()
+    config.read(config_file)
+
+    user = config.get("couchdb", "user")
+    password = config.get("couchdb", "password")
+
+    server = config.get("couchdb", "server")
+    port = config.get("couchdb", "port")
+
+    cdb = couchdbhelper.ConnectedCouchDB(server,
+                                         port=port,
+                                         dbName="identities",
+                                         username=user,
+                                         password=password)
+
+    # Mail receiver
+    mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user,
+                                                    password,
+                                                    server,
+                                                    port)
+
+    mr = MailReceiver(mail_couch_url_prefix, cdb, [])
+    fpath = filepath.FilePath(fullpath)
+
+    d = mr._process_incoming_email(None, fpath, 0)
+    d.addCallback(lambda x: reactor.stop())
+
+    reactor.run()
-- 
cgit v1.2.3