Skip to content

Commit a614ff1

Browse files
fsc-erikerfsc-eriker
committed
Update for pythonGH-104802: register a defect instead of raising an error
Based on PR review
1 parent bf6d7b5 commit a614ff1

2 files changed

Lines changed: 24 additions & 12 deletions

File tree

‎Lib/email/_header_value_parser.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,18 +1514,19 @@ def get_obs_local_part(value):
15141514
token, value = get_cfws(value)
15151515
obs_local_part.append(token)
15161516
if not obs_local_part:
1517-
raise(errors.HeaderParseError(
1518-
"abandoning parse; truncated value? ({})".format(value)))
1519-
if (obs_local_part[0].token_type == 'dot' or
1517+
obs_local_part.defects.append(errors.InvalidHeaderDefect(
1518+
"abandoned parse; truncated value?"))
1519+
else:
1520+
if (obs_local_part[0].token_type == 'dot' or
15201521
obs_local_part[0].token_type=='cfws' and
15211522
obs_local_part[1].token_type=='dot'):
1522-
obs_local_part.defects.append(errors.InvalidHeaderDefect(
1523-
"Invalid leading '.' in local part"))
1524-
if (obs_local_part[-1].token_type == 'dot' or
1523+
obs_local_part.defects.append(errors.InvalidHeaderDefect(
1524+
"Invalid leading '.' in local part"))
1525+
if (obs_local_part[-1].token_type == 'dot' or
15251526
obs_local_part[-1].token_type=='cfws' and
15261527
obs_local_part[-2].token_type=='dot'):
1527-
obs_local_part.defects.append(errors.InvalidHeaderDefect(
1528-
"Invalid trailing '.' in local part"))
1528+
obs_local_part.defects.append(errors.InvalidHeaderDefect(
1529+
"Invalid trailing '.' in local part"))
15291530
if obs_local_part.defects:
15301531
obs_local_part.token_type = 'invalid-obs-local-part'
15311532
return obs_local_part, value

‎Lib/test/test_email/test__header_value_parser.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,10 +2588,21 @@ def test_get_msg_id_empty(self):
25882588
with self.assertRaises(errors.HeaderParseError):
25892589
parser.get_msg_id('')
25902590

2591-
def test_get_msg_id_botched(self):
2592-
# gh-105802: ditto for broken Microsoft Message-Id
2593-
with self.assertRaises(errors.HeaderParseError):
2594-
parser.get_msg_id('<[83c48dddbea7492e873224a5ae1c04be-JFBVALKQOJXWILKNK4YVA7CBPJ2XEZKEMV3E64DTPRCW2YLJNR6EK6DPKNWXI4A=@microsoft.com]>')
2591+
def test_get_msg_id_square_brackets(self):
2592+
# gh-105802: test for broken Microsoft Message-Id with square brackets.
2593+
msg_id = self._test_get_x(
2594+
parser.get_msg_id,
2595+
'<[TeRriBlyLongBase64==@microsoft.com]>',
2596+
'<', # sic
2597+
'<', # sic
2598+
# This also triggers
2599+
# ObsoleteHeaderDefect('obsolete id-left in msg-id')
2600+
# and InvalidHeaderDefect('msg-id with no id-right')
2601+
[errors.ObsoleteHeaderDefect, errors.InvalidHeaderDefect,
2602+
errors.InvalidHeaderDefect],
2603+
'[TeRriBlyLongBase64==@microsoft.com]>',
2604+
)
2605+
self.assertEqual(msg_id.token_type,'msg-id')
25952606

25962607
def test_get_msg_id_valid(self):
25972608
msg_id = self._test_get_x(

0 commit comments

Comments
 (0)