summaryrefslogtreecommitdiff
path: root/loader/lib/parser.py
diff options
context:
space:
mode:
authorCédric Villemain2013-08-17 16:08:06 +0000
committerMagnus Hagander2013-08-17 16:08:06 +0000
commitaa61b93604e8c8592f80be3e33a2bf778434ab02 (patch)
tree0a01d73306d46f1fc4ae519dca0175634bcbc811 /loader/lib/parser.py
parentea92af529e6dab5db320acdaad82ab56a44c2777 (diff)
Properly recurse into multipart/sign:ed email parts
Previously we'd only recurse into multipart/mixed, but this would miss PGP-signed attachments sent by some MUAs.
Diffstat (limited to 'loader/lib/parser.py')
-rw-r--r--loader/lib/parser.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/loader/lib/parser.py b/loader/lib/parser.py
index 5ecc396..90b441a 100644
--- a/loader/lib/parser.py
+++ b/loader/lib/parser.py
@@ -261,7 +261,8 @@ class ArchivesParser(object):
return None
def recursive_get_attachments(self, container):
- if container.get_content_type() == 'multipart/mixed':
+ # We start recursion in the "multipart" container if any
+ if container.get_content_type() == 'multipart/mixed' or container.get_content_type() == 'multipart/signed':
# Multipart - worth scanning into
if not container.is_multipart():
# Wow, this is broken. It's multipart/mixed, but doesn't