From e557a4685ea1e8c65ec57fe3396a3d5614f3c5b4 Mon Sep 17 00:00:00 2001 From: Fedele Mantuano Date: Wed, 5 Apr 2017 21:47:15 +0200 Subject: [PATCH] Fixed None trust string for ipaddress --- mailparser/mailparser.py | 3 +++ mailparser/version.py | 2 +- tests/test_mail_parser.py | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/mailparser/mailparser.py b/mailparser/mailparser.py index 54e8eda..5919244 100644 --- a/mailparser/mailparser.py +++ b/mailparser/mailparser.py @@ -192,6 +192,9 @@ def get_server_ipaddress(self, trust): trust -- String that identify our mail server """ + if not trust.strip(): + return + received = self._message.get_all("received", []) for i in received: diff --git a/mailparser/version.py b/mailparser/version.py index 2567fdd..6214195 100644 --- a/mailparser/version.py +++ b/mailparser/version.py @@ -17,7 +17,7 @@ limitations under the License. """ -__version__ = "1.1.9" +__version__ = "1.1.10" if __name__ == "__main__": print(__version__) diff --git a/tests/test_mail_parser.py b/tests/test_mail_parser.py index d74834a..2fec3ad 100644 --- a/tests/test_mail_parser.py +++ b/tests/test_mail_parser.py @@ -46,6 +46,22 @@ def setUp(self): # Init self.parser = MailParser() + def test_ipaddress(self): + self.parser.parse_from_file(mail_test_2) + trust = "smtp.customers.net" + + ip = "217.76.210.112" + result = self.parser.get_server_ipaddress(trust) + self.assertEqual(result, ip) + + trust = "" + result = self.parser.get_server_ipaddress(trust) + self.assertEqual(result, None) + + trust = " " + result = self.parser.get_server_ipaddress(trust) + self.assertEqual(result, None) + def test_fingerprints_body(self): self.parser.parse_from_file(mail_test_1) md5, sha1, sha256, sha512 = fingerprints(