8000 [3.14] gh-134155: fix AttributeError in email._header_value_parser.get_address (GH-134194) by miss-islington · Pull Request #135191 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.14] gh-134155: fix AttributeError in email._header_value_parser.get_address (GH-134194) #135191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2025
+48 −2
Merged

[3.14] gh-134155: fix AttributeError in email._header_value_parser.get_address (GH-134194) #135191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/email/_header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ def get_dtext(value):
def _check_for_early_dl_end(value, domain_literal):
if value:
return False
domain_literal.append(errors.InvalidHeaderDefect(
domain_literal.defects.append(errors.InvalidHeaderDefect(
"end of input inside domain-literal"))
domain_literal.append(ValueTerminal(']', 'domain-literal-end'))
return True
Expand All @@ -1594,9 +1594,9 @@ def get_domain_literal(value):
raise errors.HeaderParseError("expected '[' at start of domain-literal "
"but found '{}'".format(value))
value = value[1:]
domain_literal.append(ValueTerminal('[', 'domain-literal-start'))
if _check_for_early_dl_end(value, domain_literal):
return domain_literal, value
domain_literal.append(ValueTerminal('[', 'domain-literal-start'))
if value[0] in WSP:
token, value = get_fws(value)
domain_literal.append(token)
Expand Down
45 changes: 45 additions & 0 deletions Lib/test/test_email/test__header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2491,6 +2491,38 @@ def test_get_address_quoted_strings_in_atom_list(self):
self.assertEqual(address.all_mailboxes[0].domain, 'example.com')
self.assertEqual(address.all_mailboxes[0].addr_spec, '"example example"@example.com')

def test_get_address_with_invalid_domain(self):
address = self._test_get_x(parser.get_address,
'<T@[',
'<T@[]>',
'<T@[]>',
[errors.InvalidHeaderDefect, # missing trailing '>' on angle-addr
errors.InvalidHeaderDefect, # end of input inside domain-literal
],
'')
self.assertEqual(address.token_type, 'address')
self.assertEqual(len(address.mailboxes), 0)
self.assertEqual(len(address.all_mailboxes), 1)
self.assertEqual(address.all_mailboxes[0].domain, '[]')
self.assertEqual(address.all_mailboxes[0].local_part, 'T')
self.assertEqual(address.all_mailboxes[0].token_type, 'invalid-mailbox')
self.assertEqual(address[0].token_type, 'invalid-mailbox')

address = self._test_get_x(parser.get_address,
'!an??:=m==fr2@[C',
'!an??:=m==fr2@[C];',
'!an??:=m==fr2@[C];',
[errors.InvalidHeaderDefect, # end of header in group
errors.InvalidHeaderDefect, # end of input inside domain-literal
],
'')
self.assertEqual(address.token_type, 'address')
self.assertEqual(len(address.mailboxes), 0)
self.assertEqual(len(address.all_mailboxes), 1)
self.assertEqual(address.all_mailboxes[0].domain, '[C]')
self.assertEqual(address.all_mailboxes[0].local_part, '=m==fr2')
self.assertEqual(address.all_mailboxes[0].token_type, 'invalid-mailbox')
self.assertEqual(address[0].token_type, 'group')

# get_address_list

Expand Down Expand Up @@ -2765,6 +2797,19 @@ def test_parse_valid_message_id(self):
)
self.assertEqual(message_id.token_type, 'message-id')

def test_parse_message_id_with_invalid_domain(self):
message_id = self._test_parse_x(
parser.parse_message_id,
"<T@[",
"<T@[]>",
"<T@[]>",
[errors.ObsoleteHeaderDefect] + [errors.InvalidHeaderDefect] * 2,
[],
)
self.assertEqual(message_id.token_type, 'message-id')
self.assertEqual(str(message_id.all_defects[-1]),
"end of input inside domain-literal")

def test_parse_message_id_with_remaining(self):
message_id = self._test_parse_x(
parser.parse_message_id,
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-05-18-23-46-21.gh-issue-134152.30HwbX.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:mod:`email`: Fix parsing of email message ID with invalid domain.
Loading
0