mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.12] gh-106669: Revert "gh-102988: Detect email address parsing errors ... (GH-105127)" (GH-106733) (#106941)

Browse source 
This reverts commit 18dfbd0357.
Adds a regression test from the issue.

See https://github.com/python/cpython/issues/106669..
(cherry picked from commit a31dea1feb)
This commit is contained in:
Gregory P. Smith 2023-07-20 21:05:46 -07:00 • committed by GitHub
parent c1fd76e138
commit 656f62454b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Lib/test/test_email/test_email.py
View file

@ -3319,90 +3319,32 @@ Foo
[('Al Person', 'aperson@dom.ain'),
('Bud Person', 'bperson@dom.ain')])
def test_getaddresses_parsing_errors(self):
"""Test for parsing errors from CVE-2023-27043"""
eq = self.assertEqual
eq(utils.getaddresses(['alice@example.org(<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org)<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org<<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org><bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org@<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org,<bob@example.com>']),
[('', 'alice@example.org'), ('', 'bob@example.com')])
eq(utils.getaddresses(['alice@example.org;<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org:<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org.<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org"<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org[<bob@example.com>']),
[('', '')])
eq(utils.getaddresses(['alice@example.org]<bob@example.com>']),
[('', '')])
def test_parseaddr_parsing_errors(self):
"""Test for parsing errors from CVE-2023-27043"""
eq = self.assertEqual
eq(utils.parseaddr(['alice@example.org(<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org)<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org<<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org><bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org@<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org,<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org;<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org:<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org.<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org"<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org[<bob@example.com>']),
('', ''))
eq(utils.parseaddr(['alice@example.org]<bob@example.com>']),
('', ''))
def test_getaddresses_comma_in_name(self):
"""GH-106669 regression test."""
self.assertEqual(
utils.getaddresses(
[
'"Bud, Person" <bperson@dom.ain>',
'aperson@dom.ain (Al Person)',
'"Mariusz Felisiak" <to@example.com>',
]
),
[
('Bud, Person', 'bperson@dom.ain'),
('Al Person', 'aperson@dom.ain'),
('Mariusz Felisiak', 'to@example.com'),
],
)
def test_getaddresses_nasty(self):
eq = self.assertEqual
eq(utils.getaddresses(['foo: ;']), [('', '')])
eq(utils.getaddresses(['[]*-- =~$']), [('', '')])
eq(utils.getaddresses(
['[]*-- =~$']),
[('', ''), ('', ''), ('', '*--')])
eq(utils.getaddresses(
['foo: ;', '"Jason R. Mastaler" <jason@dom.ain>']),
[('', ''), ('Jason R. Mastaler', 'jason@dom.ain')])
eq(utils.getaddresses(
[r'Pete(A nice \) chap) <pete(his account)@silly.test(his host)>']),
[('Pete (A nice ) chap his account his host)', 'pete@silly.test')])
eq(utils.getaddresses(
['(Empty list)(start)Undisclosed recipients :(nobody(I know))']),
[('', '')])
eq(utils.getaddresses(
['Mary <@machine.tld:mary@example.net>, , jdoe@test . example']),
[('Mary', 'mary@example.net'), ('', ''), ('', 'jdoe@test.example')])
eq(utils.getaddresses(
['John Doe <jdoe@machine(comment). example>']),
[('John Doe (comment)', 'jdoe@machine.example')])
eq(utils.getaddresses(
['"Mary Smith: Personal Account" <smith@home.example>']),
[('Mary Smith: Personal Account', 'smith@home.example')])
eq(utils.getaddresses(
['Undisclosed recipients:;']),
[('', '')])
eq(utils.getaddresses(
[r'<boss@nil.test>, "Giant; \"Big\" Box" <bob@example.net>']),
[('', 'boss@nil.test'), ('Giant; "Big" Box', 'bob@example.net')])
def test_getaddresses_embedded_comment(self):
"""Test proper handling of a nested comment"""