diff options
author | Gregory P. Smith <greg@krypto.org> | 2023-07-21 04:05:46 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-21 04:05:46 (GMT) |
commit | 656f62454bff35db8d630ca43c94bf6db44338ba (patch) | |
tree | cdf2a5e6a6c7fc34c886ec648ddaf94c9201d535 /Lib/test | |
parent | c1fd76e138c0acf4b90b08ded990d6521187fe63 (diff) | |
download | cpython-656f62454bff35db8d630ca43c94bf6db44338ba.zip cpython-656f62454bff35db8d630ca43c94bf6db44338ba.tar.gz cpython-656f62454bff35db8d630ca43c94bf6db44338ba.tar.bz2 |
[3.12] gh-106669: Revert "gh-102988: Detect email address parsing errors ... (GH-105127)" (GH-106733) (#106941)
This reverts commit 18dfbd035775c15533d13a98e56b1d2bf5c65f00.
Adds a regression test from the issue.
See https://github.com/python/cpython/issues/106669..
(cherry picked from commit a31dea1feb61793e48fa9aa5014f358352205c1d)
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_email/test_email.py | 96 |
1 files changed, 19 insertions, 77 deletions
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 5238944..b4f3a24 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -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""" |