catch invalid data in received header when parsing date.

- Issue #347

1 files changed, 13 insertions, 9 deletions

diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index ff58b330..618b980a 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -323,15 +323,19 @@ class PixelatedMail(Mail):
 
     def _get_date(self):
         date = self.hdoc.content.get('date', None)
-        if not date:
-            received = self.hdoc.content.get('received', None)
-            if received:
-                date = received.split(";")[-1].strip()
-            else:
-                # we can't get a date for this mail, so lets just use now
-                logger.warning('Encountered a mail with missing date and received header fields. Subject %s' % self.hdoc.content.get('subject', None))
-                date = pixelated.support.date.iso_now()
-        return dateparser.parse(date).isoformat()
+        try:
+            if not date:
+                received = self.hdoc.content.get('received', None)
+                if received:
+                        date = received.split(";")[-1].strip()
+                else:
+                    # we can't get a date for this mail, so lets just use now
+                    logger.warning('Encountered a mail with missing date and received header fields. Subject %s' % self.hdoc.content.get('subject', None))
+                    date = pixelated.support.date.iso_now()
+            return dateparser.parse(date).isoformat()
+        except (ValueError, TypeError) as e:
+            date = pixelated.support.date.iso_now()
+            return dateparser.parse(date).isoformat()
 
     @property
     def security_casing(self):