Skip to content

bpo-39073: validate Address parts to disallow CRLF #19007

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 8 commits into from
Mar 30, 2020
Merged

bpo-39073: validate Address parts to disallow CRLF #19007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38d0a15
validate address parts
epicfaace Mar 15, 2020
d8424e5
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 15, 2020
de6ef8c
do validation at once, on \r and \n, refactor tests
epicfaace Mar 16, 2020
950bd01
Merge branch 'val-address' of github.com:epicfaace/cpython into val-a…
epicfaace Mar 16, 2020
6cac3a0
rm extra spacing
epicfaace Mar 16, 2020
d10d383
Add display_name test
epicfaace Mar 16, 2020
81a0231
update message
epicfaace Mar 16, 2020
526b750
Update Misc/NEWS.d/next/Security/2020-03-15-01-28-36.bpo-39073.6Szd3i…
epicfaace Mar 16, 2020
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
5 changes: 5 additions & 0 deletions Lib/email/headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ def __init__(self, display_name='', username='', domain='', addr_spec=None):
without any Content Transfer Encoding.

"""

inputs = ''.join(filter(None, (display_name, username, domain, addr_spec)))
if '\r' in inputs or '\n' in inputs:
raise ValueError("invalid arguments; address parts cannot contain CR or LF")

# This clause with its potential 'raise' may only happen when an
# application program creates an Address object using an addr_spec
# keyword. The email library code itself must always supply username
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_email/test_headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,25 @@ def test_il8n(self):
# with self.assertRaises(ValueError):
# Address('foo', 'wők', 'example.com')

def test_crlf_in_constructor_args_raises(self):
cases = (
dict(display_name='foo\r'),
dict(display_name='foo\n'),
dict(display_name='foo\r\n'),
dict(domain='example.com\r'),
dict(domain='example.com\n'),
dict(domain='example.com\r\n'),
dict(username='wok\r'),
dict(username='wok\n'),
dict(username='wok\r\n'),
dict(addr_spec='wok@example.com\r'),
dict(addr_spec='wok@example.com\n'),
dict(addr_spec='wok@example.com\r\n')
)
for kwargs in cases:
with self.subTest(kwargs=kwargs), self.assertRaisesRegex(ValueError, "invalid arguments"):
Address(**kwargs)

def test_non_ascii_username_in_addr_spec_raises(self):
with self.assertRaises(ValueError):
Address('foo', addr_spec='wők@example.com')
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Security/2020-03-15-01-28-36.bpo-39073.6Szd3i.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Disallow CR or LF in email.headerregistry.Address arguments to guard against header injection attacks.