Mailing List Archive

https://github.com/python/cpython/commit/95982c983fa61a1967c81f4acd16e06b2d95a550
commit: 95982c983fa61a1967c81f4acd16e06b2d95a550
branch: 3.12
author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
committer: serhiy-storchaka <storchaka@gmail.com>
date: 2024-04-17T08:03:12Z
summary:

[3.12] gh-86650: Fix IndexError when parse emails with invalid Message-ID (GH-117934) (GH-117965)

In particularly, one-off addresses generated by Microsoft Outlook:
https://learn.microsoft.com/en-us/office/client-developer/outlook/mapi/one-off-addresses

(cherry picked from commit f74e51229c83e3265f905dc15283bfe0ec1a659e)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Co-authored-by: fsc-eriker <72394365+fsc-eriker@users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2024-04-16-18-34-11.gh-issue-86650.Zeydyg.rst
M Lib/email/_header_value_parser.py
M Lib/test/test_email/test__header_value_parser.py

diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index 0cf23fc9f656b1..7755e629500a8f 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -1520,13 +1520,18 @@ def get_obs_local_part(value):
raise
token, value = get_cfws(value)
obs_local_part.append(token)
+ if not obs_local_part:
+ raise errors.HeaderParseError(
+ "expected obs-local-part but found '{}'".format(value))
if (obs_local_part[0].token_type == 'dot' or
obs_local_part[0].token_type=='cfws' and
+ len(obs_local_part) > 1 and
obs_local_part[1].token_type=='dot'):
obs_local_part.defects.append(errors.InvalidHeaderDefect(
"Invalid leading '.' in local part"))
if (obs_local_part[-1].token_type == 'dot' or
obs_local_part[-1].token_type=='cfws' and
+ len(obs_local_part) > 1 and
obs_local_part[-2].token_type=='dot'):
obs_local_part.defects.append(errors.InvalidHeaderDefect(
"Invalid trailing '.' in local part"))
diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py
index dd1af9954c61da..39ed4ee2a38159 100644
--- a/Lib/test/test_email/test__header_value_parser.py
+++ b/Lib/test/test_email/test__header_value_parser.py
@@ -2724,6 +2724,31 @@ def test_get_msg_id_no_angle_end(self):
)
self.assertEqual(msg_id.token_type, 'msg-id')

+ def test_get_msg_id_empty_id_left(self):
+ with self.assertRaises(errors.HeaderParseError):
+ parser.get_msg_id("<@domain>")
+
+ def test_get_msg_id_empty_id_right(self):
+ with self.assertRaises(errors.HeaderParseError):
+ parser.get_msg_id("<simplelocal@>")
+
+ def test_get_msg_id_with_brackets(self):
+ # Microsof Outlook generates non-standard one-off addresses:
+ # https://learn.microsoft.com/en-us/office/client-developer/outlook/mapi/one-off-addresses
+ with self.assertRaises(errors.HeaderParseError):
+ parser.get_msg_id("<[abrakadabra@microsoft.com]>")
+
+ def test_get_msg_id_ws_only_local(self):
+ msg_id = self._test_get_x(
+ parser.get_msg_id,
+ "< @domain>",
+ "< @domain>",
+ "< @domain>",
+ [errors.ObsoleteHeaderDefect],
+ ""
+ )
+ self.assertEqual(msg_id.token_type, 'msg-id')
+


@parameterize
diff --git a/Misc/NEWS.d/next/Library/2024-04-16-18-34-11.gh-issue-86650.Zeydyg.rst b/Misc/NEWS.d/next/Library/2024-04-16-18-34-11.gh-issue-86650.Zeydyg.rst
new file mode 100644
index 00000000000000..8a1626fa63c804
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-04-16-18-34-11.gh-issue-86650.Zeydyg.rst
@@ -0,0 +1,2 @@
+Fix IndexError when parse some emails with invalid Message-ID (including
+one-off addresses generated by Microsoft Outlook).

_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-leave@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: list-python-checkins@lists.gossamer-threads.com