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

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

Co-authored-by: fsc-eriker <72394365+fsc-eriker@users.noreply.github.com>
This commit is contained in:
Serhiy Storchaka 2024-04-17 10:44:41 +03:00 committed by GitHub
parent 8cc9adbfdd
commit f74e51229c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 0 deletions

View File

@ -1520,13 +1520,18 @@ def get_obs_local_part(value):
raise raise
token, value = get_cfws(value) token, value = get_cfws(value)
obs_local_part.append(token) 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 if (obs_local_part[0].token_type == 'dot' or
obs_local_part[0].token_type=='cfws' and obs_local_part[0].token_type=='cfws' and
len(obs_local_part) > 1 and
obs_local_part[1].token_type=='dot'): obs_local_part[1].token_type=='dot'):
obs_local_part.defects.append(errors.InvalidHeaderDefect( obs_local_part.defects.append(errors.InvalidHeaderDefect(
"Invalid leading '.' in local part")) "Invalid leading '.' in local part"))
if (obs_local_part[-1].token_type == 'dot' or if (obs_local_part[-1].token_type == 'dot' or
obs_local_part[-1].token_type=='cfws' and obs_local_part[-1].token_type=='cfws' and
len(obs_local_part) > 1 and
obs_local_part[-2].token_type=='dot'): obs_local_part[-2].token_type=='dot'):
obs_local_part.defects.append(errors.InvalidHeaderDefect( obs_local_part.defects.append(errors.InvalidHeaderDefect(
"Invalid trailing '.' in local part")) "Invalid trailing '.' in local part"))

View File

@ -2724,6 +2724,31 @@ class TestParser(TestParserMixin, TestEmailBase):
) )
self.assertEqual(msg_id.token_type, 'msg-id') 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 @parameterize

View File

@ -0,0 +1,2 @@
Fix IndexError when parse some emails with invalid Message-ID (including
one-off addresses generated by Microsoft Outlook).