From 1c3b8d861db49ee723a7470301a63a8ca2994f5c Mon Sep 17 00:00:00 2001 From: Giovane Date: Thu, 21 Jan 2016 16:31:14 -0200 Subject: [feat] Validate signature with attachments - Create a new Generator that doesn't trim the headers - Extract detached signature from message - Convert message to the body an attachments level - Add coment to the generator workaround and shows which python version has the patch --- src/leap/mail/generator.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/leap/mail/generator.py (limited to 'src/leap/mail/generator.py') diff --git a/src/leap/mail/generator.py b/src/leap/mail/generator.py new file mode 100644 index 0000000..28db8da --- /dev/null +++ b/src/leap/mail/generator.py @@ -0,0 +1,21 @@ +from email.generator import Generator as EmailGenerator + +class Generator(EmailGenerator): + """ + Generates output from a Message object tree, keeping signatures. + + This code was extracted from Mailman.Generator.Generator, version 2.1.4: + + Most other Generator will be created not setting the foldheader flag, + as we do not overwrite clone(). The original clone() does not + set foldheaders. + + So you need to set foldheaders if you want the toplevel to fold headers + + TODO: Python 3.3 is patched against this problems. See issue 1590744 on python bug tracker. + """ + def _write_headers(self, msg): + for h, v in msg.items(): + print >> self._fp, '%s:' % h, + print >> self._fp, v + print >> self._fp -- cgit v1.2.3 From 27f1a84897bf60135820a99f92bfdd36e97450e5 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Tue, 9 Feb 2016 10:29:52 +0100 Subject: [tests] fix missing pycryptopp dependency and mock async calls - leap_mail still uses pycryptopp and therefore still needs the dependency - Keymanager calls to async HTTPClient had not been mocked, causing a test to fail - fixed a pep8 warning --- src/leap/mail/generator.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/leap/mail/generator.py') diff --git a/src/leap/mail/generator.py b/src/leap/mail/generator.py index 28db8da..7028817 100644 --- a/src/leap/mail/generator.py +++ b/src/leap/mail/generator.py @@ -1,5 +1,6 @@ from email.generator import Generator as EmailGenerator + class Generator(EmailGenerator): """ Generates output from a Message object tree, keeping signatures. -- cgit v1.2.3 From aa87f3bb4205b6a756668aac15fe92acb41bf067 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Tue, 9 Feb 2016 17:09:14 +0100 Subject: [style] fix pep8 --- src/leap/mail/generator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/leap/mail/generator.py') diff --git a/src/leap/mail/generator.py b/src/leap/mail/generator.py index 7028817..bb3f26e 100644 --- a/src/leap/mail/generator.py +++ b/src/leap/mail/generator.py @@ -13,7 +13,8 @@ class Generator(EmailGenerator): So you need to set foldheaders if you want the toplevel to fold headers - TODO: Python 3.3 is patched against this problems. See issue 1590744 on python bug tracker. + TODO: Python 3.3 is patched against this problems. See issue 1590744 on + python bug tracker. """ def _write_headers(self, msg): for h, v in msg.items(): -- cgit v1.2.3