diff options
| author | Dong-hee Na <donghee.na92@gmail.com> | 2018-07-28 12:55:11 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2018-07-28 12:55:11 (GMT) |
| commit | 8fe9eed937cb69b5e26ac6e36a90b5360eb11277 (patch) | |
| tree | e3f74736ae5bd06852e53e1e6a1457c435261285 | |
| parent | 1d2dafa249c7fb34f3d24e7a77d1bea02907d92b (diff) | |
| download | cpython-8fe9eed937cb69b5e26ac6e36a90b5360eb11277.zip cpython-8fe9eed937cb69b5e26ac6e36a90b5360eb11277.tar.gz cpython-8fe9eed937cb69b5e26ac6e36a90b5360eb11277.tar.bz2 | |
bpo-33476: Fix _header_value_parser when address group is missing final ';' (GH-7484)
| -rw-r--r-- | Lib/email/_header_value_parser.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/test__header_value_parser.py | 25 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-06-08-00-29-40.bpo-33476.R0Bhlj.rst | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index d8becee..e805a75 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -1875,7 +1875,7 @@ def get_group(value): if not value: group.defects.append(errors.InvalidHeaderDefect( "end of header in group")) - if value[0] != ';': + elif value[0] != ';': raise errors.HeaderParseError( "expected ';' at end of group but found {}".format(value)) group.append(ValueTerminal(';', 'group-terminator')) diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index 5036de2..676732b 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -2152,6 +2152,31 @@ class TestParser(TestParserMixin, TestEmailBase): self.assertEqual(group.mailboxes[1].local_part, 'x') 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 def test_get_address_simple(self): diff --git a/Misc/NEWS.d/next/Library/2018-06-08-00-29-40.bpo-33476.R0Bhlj.rst b/Misc/NEWS.d/next/Library/2018-06-08-00-29-40.bpo-33476.R0Bhlj.rst new file mode 100644 index 0000000..8104753 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-08-00-29-40.bpo-33476.R0Bhlj.rst @@ -0,0 +1,2 @@ +Fix _header_value_parser.py when address group is missing final ';'. +Contributed by Enrique Perez-Terron |