Skip to content

bpo-30681: Support invalid date format or value in email Date header #10783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
timb07 wants to merge 4 commits into from
Closed

bpo-30681: Support invalid date format or value in email Date header #10783

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db7496a
bpo-30681: Handle invalid date in Date header
timb07 Nov 29, 2018
0f5c299
bpo-30681: Add InvalidDateDefect
timb07 Nov 29, 2018
d6087ac
bpo-30681: Document failure modes of parsedate_to_datetime and add tests
timb07 Nov 28, 2018
1cef999
bpo-30681: Add Misc/NEWS.d entry
timb07 Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-30681: Handle invalid date in Date header
  • Loading branch information
@timb07
timb07 committed Nov 29, 2018
commit db7496af8af25632590e653b5e0358c098736347
9 changes: 8 additions & 1 deletion Lib/email/headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,14 @@ def parse(cls, value, kwds):
kwds['parse_tree'] = parser.TokenList()
return
if isinstance(value, str):
value = utils.parsedate_to_datetime(value)
kwds['decoded'] = value
try:
value = utils.parsedate_to_datetime(value)
except (ValueError, TypeError):
kwds['defects'].append(errors.InvalidHeaderDefect('Invalid date value or format'))
kwds['datetime'] = None
kwds['parse_tree'] = parser.TokenList()
return
kwds['datetime'] = value
kwds['decoded'] = utils.format_datetime(kwds['datetime'])
kwds['parse_tree'] = cls.value_parser(kwds['decoded'])
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_email/test_headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,22 @@ def test_no_value_is_defect(self):
self.assertEqual(len(h.defects), 1)
self.assertIsInstance(h.defects[0], errors.HeaderMissingRequiredValue)

def test_invalid_date_format(self):
s = 'Not a date header'
h = self.make_header('date', s)
self.assertEqual(h, s)
self.assertIsNone(h.datetime)
self.assertEqual(len(h.defects), 1)
self.assertIsInstance(h.defects[0], errors.InvalidHeaderDefect)

def test_invalid_date_value(self):
s = 'Tue, 06 Jun 2017 27:39:33 +0600'
h = self.make_header('date', s)
self.assertEqual(h, s)
self.assertIsNone(h.datetime)
self.assertEqual(len(h.defects), 1)
self.assertIsInstance(h.defects[0], errors.InvalidHeaderDefect)

def test_datetime_read_only(self):
h = self.make_header('date', self.datestring)
with self.assertRaises(AttributeError):
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_email/test_inversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ def msg_as_input(self, msg):
foo
"""),),

'header_with_invalid_date': (dedent(b"""\
Date: Tue, 06 Jun 2017 27:39:33 +0600
From: abc@xyz.com
Subject: timezones

How do they work even?
"""),),

}

payload_params = {
Expand Down