diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-26 22:05:36 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2019-06-26 22:05:36 (GMT) |
| commit | 82654a037211a3466a294d53952926fc87f8403d (patch) | |
| tree | 45a1c38b23e52963954dc0308b6d64e290e93fb5 | |
| parent | 04d4692579cc4e0204c7fbced3692f8aa4bbb857 (diff) | |
| download | cpython-82654a037211a3466a294d53952926fc87f8403d.zip cpython-82654a037211a3466a294d53952926fc87f8403d.tar.gz cpython-82654a037211a3466a294d53952926fc87f8403d.tar.bz2 | |
bpo-29412: Fix indexError when parsing a header value ending unexpectedly (GH-14387) (GH-14411)
* patched string index out of range error in get_word function of _header_value_parser.py and created tests in test__header_value_parser.py for CFWS.
* Raise HeaderParseError instead of continuing when parsing a word.
(cherry picked from commit 7213df7bbfd85378c6e42e1ac63144d5974bdcf6)
Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
| -rw-r--r-- | Lib/email/_header_value_parser.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_email/test__header_value_parser.py | 17 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst | 2 |
3 files changed, 22 insertions, 0 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index 308db4d..d9f592b 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -1339,6 +1339,9 @@ def get_word(value): leader, value = get_cfws(value) else: leader = None + if not value: + raise errors.HeaderParseError( + "Expected 'atom' or 'quoted-string' but found nothing.") if value[0]=='"': token, value = get_quoted_string(value) elif value[0] in SPECIALS: diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index 12da3cf..14d1ff3 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -910,6 +910,12 @@ class TestParser(TestParserMixin, TestEmailBase): self.assertEqual(word.token_type, 'atom') self.assertEqual(word[0].token_type, 'cfws') + def test_get_word_all_CFWS(self): + # bpo-29412: Test that we don't raise IndexError when parsing CFWS only + # token. + with self.assertRaises(errors.HeaderParseError): + parser.get_word('(Recipients list suppressed') + def test_get_word_qs_yields_qs(self): word = self._test_get_x(parser.get_word, '"bar " (bang) ah', '"bar " (bang) ', 'bar ', [], 'ah') @@ -2323,6 +2329,17 @@ class TestParser(TestParserMixin, TestEmailBase): # get_address_list + def test_get_address_list_CFWS(self): + address_list = self._test_get_x(parser.get_address_list, + '(Recipient list suppressed)', + '(Recipient list suppressed)', + ' ', + [errors.ObsoleteHeaderDefect], # no content in address list + '') + self.assertEqual(address_list.token_type, 'address-list') + self.assertEqual(len(address_list.mailboxes), 0) + self.assertEqual(address_list.mailboxes, address_list.all_mailboxes) + def test_get_address_list_mailboxes_simple(self): address_list = self._test_get_x(parser.get_address_list, 'dinsdale@example.com', diff --git a/Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst b/Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst new file mode 100644 index 0000000..b8fac46 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst @@ -0,0 +1,2 @@ +Fix IndexError in parsing a header value ending unexpectedly. Patch by Abhilash +Raj. |