Merge branch 'hotfix/1.1.10'

SpamScope · Apr 5, 2017 · 6b634fe · 6b634fe
2 parents dcfb146 + e557a46
commit 6b634fe
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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(