diff options
| author | Ashwin Ramaswami <aramaswamis@gmail.com> | 2019-08-31 15:25:35 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-08-31 15:25:35 (GMT) |
| commit | c5b242f87f31286ad38991bc3868cf4cfbf2b681 (patch) | |
| tree | 80f7659bec45074eb85998dfc041c0e1176b5dcc /Lib/test/test_email | |
| parent | daa82d019c52e95c3c57275307918078c1c0ac81 (diff) | |
| download | cpython-c5b242f87f31286ad38991bc3868cf4cfbf2b681.zip cpython-c5b242f87f31286ad38991bc3868cf4cfbf2b681.tar.gz cpython-c5b242f87f31286ad38991bc3868cf4cfbf2b681.tar.bz2 | |
bpo-37764: Fix infinite loop when parsing unstructured email headers. (GH-15239)
Fixes a case in which email._header_value_parser.get_unstructured hangs the system for some invalid headers. This covers the cases in which the header contains either:
- a case without trailing whitespace
- an invalid encoded word
https://bugs.python.org/issue37764
This fix should also be backported to 3.7 and 3.8
https://bugs.python.org/issue37764
Diffstat (limited to 'Lib/test/test_email')
| -rw-r--r-- | Lib/test/test_email/test__header_value_parser.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_email/test_email.py | 21 |
2 files changed, 37 insertions, 0 deletions
diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index b3e6b26..058d902 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -383,6 +383,22 @@ class TestParser(TestParserMixin, TestEmailBase): [errors.InvalidHeaderDefect], '') + def test_get_unstructured_without_trailing_whitespace_hang_case(self): + self._test_get_x(self._get_unst, + '=?utf-8?q?somevalue?=aa', + 'somevalueaa', + 'somevalueaa', + [errors.InvalidHeaderDefect], + '') + + def test_get_unstructured_invalid_ew(self): + self._test_get_x(self._get_unst, + '=?utf-8?q?=somevalue?=', + '=?utf-8?q?=somevalue?=', + '=?utf-8?q?=somevalue?=', + [], + '') + # get_qp_ctext def test_get_qp_ctext_only(self): diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index ae96258..8ec3919 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -5381,6 +5381,27 @@ Content-Type: application/x-foo; eq(language, 'en-us') eq(s, 'My Document For You') + def test_should_not_hang_on_invalid_ew_messages(self): + messages = ["""From: user@host.com +To: user@host.com +Bad-Header: + =?us-ascii?Q?LCSwrV11+IB0rSbSker+M9vWR7wEDSuGqmHD89Gt=ea0nJFSaiz4vX3XMJPT4vrE?= + =?us-ascii?Q?xGUZeOnp0o22pLBB7CYLH74Js=wOlK6Tfru2U47qR?= + =?us-ascii?Q?72OfyEY2p2=2FrA9xNFyvH+fBTCmazxwzF8nGkK6D?= + +Hello! +""", """From: ����� �������� <xxx@xxx> +To: "xxx" <xxx@xxx> +Subject: ��� ���������� ����� ����� � ��������� �� ���� +MIME-Version: 1.0 +Content-Type: text/plain; charset="windows-1251"; +Content-Transfer-Encoding: 8bit + +�� ����� � ���� ������ ��� �������� +"""] + for m in messages: + with self.subTest(m=m): + msg = email.message_from_string(m) # Tests to ensure that signed parts of an email are completely preserved, as |