mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 11:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpo-33476: Fix _header_value_parser when address group is missing final ';' (GH-7484)

Browse Source
This commit is contained in:
Dong-hee Na 2018-07-28 21:55:11 +09:00 committed by Steve Dower
parent 1d2dafa249
commit 8fe9eed937
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/email/_header_value_parser.py
View File

@ -1875,7 +1875,7 @@ def get_group(value):
if not value: if not value:
group.defects.append(errors.InvalidHeaderDefect( group.defects.append(errors.InvalidHeaderDefect(
"end of header in group")) "end of header in group"))
if value[0] != ';': elif value[0] != ';':
raise errors.HeaderParseError( raise errors.HeaderParseError(
"expected ';' at end of group but found {}".format(value)) "expected ';' at end of group but found {}".format(value))
group.append(ValueTerminal(';', 'group-terminator')) group.append(ValueTerminal(';', 'group-terminator'))

25
Lib/test/test_email/test__header_value_parser.py
View File

@ -2152,6 +2152,31 @@ class TestParser(TestParserMixin, TestEmailBase):
self.assertEqual(group.mailboxes[1].local_part, 'x') self.assertEqual(group.mailboxes[1].local_part, 'x')
self.assertIsNone(group.all_mailboxes[1].display_name) self.assertIsNone(group.all_mailboxes[1].display_name)
def test_get_group_missing_final_semicol(self):
group = self._test_get_x(parser.get_group,
('Monty Python:"Fred A. Bear" <dinsdale@example.com>,'
'eric@where.test,John <jdoe@test>'),
('Monty Python:"Fred A. Bear" <dinsdale@example.com>,'
'eric@where.test,John <jdoe@test>;'),
('Monty Python:"Fred A. Bear" <dinsdale@example.com>,'
'eric@where.test,John <jdoe@test>;'),
[errors.InvalidHeaderDefect],
'')
self.assertEqual(group.token_type, 'group')
self.assertEqual(group.display_name, 'Monty Python')
self.assertEqual(len(group.mailboxes), 3)
self.assertEqual(group.mailboxes,
group.all_mailboxes)
self.assertEqual(group.mailboxes[0].addr_spec,
'dinsdale@example.com')
self.assertEqual(group.mailboxes[0].display_name,
'Fred A. Bear')
self.assertEqual(group.mailboxes[1].addr_spec,
'eric@where.test')
self.assertEqual(group.mailboxes[2].display_name,
'John')
self.assertEqual(group.mailboxes[2].addr_spec,
'jdoe@test')
# get_address # get_address
def test_get_address_simple(self): def test_get_address_simple(self):

2
Misc/NEWS.d/next/Library/2018-06-08-00-29-40.bpo-33476.R0Bhlj.rst Normal file
View File

@ -0,0 +1,2 @@
Fix _header_value_parser.py when address group is missing final ';'.
Contributed by Enrique Perez-Terron