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
Prev Previous commit
Next Next commit
bpo-30681: Add InvalidDateDefect
  • Loading branch information
@timb07
timb07 committed Nov 29, 2018
commit 0f5c299c148f99c5ef7e3d8b17d0ba91b67a105c
3 changes: 3 additions & 0 deletions Lib/email/errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,6 @@ class NonASCIILocalPartDefect(HeaderDefect):
"""local_part contains non-ASCII characters"""
# This defect only occurs during unicode parsing, not when
# parsing messages decoded from binary.

class InvalidDateDefect(HeaderDefect):

@maxking maxking May 27, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also please add this to documentation under email.errors.rst ?

"""Header has unparseable or invalid date"""
2 changes: 1 addition & 1 deletion Lib/email/headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ def parse(cls, value, kwds):
try:
value = utils.parsedate_to_datetime(value)
except (ValueError, TypeError):
kwds['defects'].append(errors.InvalidHeaderDefect('Invalid date value or format'))
kwds['defects'].append(errors.InvalidDateDefect('Invalid date value or format'))
kwds['datetime'] = None
kwds['parse_tree'] = parser.TokenList()
return
Expand Down
4 changes: 2 additions & 2 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 @@ -209,15 +209,15 @@ def test_invalid_date_format(self):
self.assertEqual(h, s)
self.assertIsNone(h.datetime)
self.assertEqual(len(h.defects), 1)
self.assertIsInstance(h.defects[0], errors.InvalidHeaderDefect)
self.assertIsInstance(h.defects[0], errors.InvalidDateDefect)

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)
self.assertIsInstance(h.defects[0], errors.InvalidDateDefect)

def test_datetime_read_only(self):
h = self.make_header('date', self.datestring)
Expand Down