diff --git a/imbox/parser.py b/imbox/parser.py index d497ab9..c45fdb6 100644 --- a/imbox/parser.py +++ b/imbox/parser.py @@ -82,7 +82,11 @@ def parse_attachment(message_part): # Check again if this is a valid attachment content_disposition = message_part.get("Content-Disposition", None) if content_disposition is not None and not message_part.is_multipart(): - dispositions = content_disposition.strip().split(";") + dispositions = [ + disposition.strip() + for disposition in content_disposition.split(";") + if disposition.strip() + ] if dispositions[0].lower() in ["attachment", "inline"]: file_data = message_part.get_payload(decode=True) diff --git a/tests/parser_tests.py b/tests/parser_tests.py index 254ee8d..c5165dd 100644 --- a/tests/parser_tests.py +++ b/tests/parser_tests.py @@ -84,6 +84,47 @@ Content-Transfer-Encoding: quoted-printable """ +raw_email_encoded_multipart = b"""Delivered-To: receiver@example.com +Return-Path: +Date: Tue, 08 Aug 2017 08:15:11 -0700 +From: +To: interviews+347243@gethappie.me +Message-Id: <20170808081511.2b876c018dd94666bcc18e28cf079afb.99766f164b.wbe@email24.godaddy.com> +Subject: RE: Kari, are you open to this? +Mime-Version: 1.0 +Content-Type: multipart/related; + boundary="=_7c18e0b95b772890a22ed6c0f810a434" + +--=_7c18e0b95b772890a22ed6c0f810a434 +Content-Transfer-Encoding: quoted-printable +Content-Type: text/html; charset="utf-8" + +
Hi Richie,
 +--=_7c18e0b95b772890a22ed6c0f810a434 +Content-Transfer-Encoding: base64 +Content-Type: image/jpeg; charset=binary; + name="sigimg0"; +Content-Disposition: inline; + filename="sigimg0"; + +/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg +jt0JaKhjm3xq23GR60UuZBZn/9k= +--=_7c18e0b95b772890a22ed6c0f810a434 +Content-Transfer-Encoding: base64 +Content-Type: image/jpeg; charset=binary; + name="sigimg1"; +Content-Disposition: inline; + filename="sigimg1"; + +/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg +SlBFRyB2NjIpLCBkZWZhdWx0IHF1YWxpdHkK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP +ooooA//Z +--=_7c18e0b95b772890a22ed6c0f810a434-- + +""" + + raw_email_encoded_bad_multipart = b"""Delivered-To: receiver@example.com Return-Path: From: sender@example.com @@ -260,6 +301,10 @@ class TestParser(unittest.TestCase): self.assertTrue(parsed_email.body['plain']) self.assertTrue(parsed_email.body['html']) + def test_parse_email_multipart(self): + parsed_email = parse_email(raw_email_encoded_multipart) + self.assertEqual("RE: Kari, are you open to this?", parsed_email.subject) + def test_parse_email_bad_multipart(self): parsed_email = parse_email(raw_email_encoded_bad_multipart) self.assertEqual("Re: Looking to connect with you...", parsed_email.subject)