Skip to content

gh-121650 : detect newlines in headers #121812

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

Closed
basbloemsaat wants to merge 12 commits into from
Closed

gh-121650 : detect newlines in headers #121812

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d3ca18a
detect line splits, also at the end
basbloemsaat Jul 14, 2024
891d4f8
also detect encoded newlines
basbloemsaat Jul 15, 2024
67d4121
Merge branch 'main' into fix-issue-121650-detect-newlines-in-headers
basbloemsaat Jul 15, 2024
62ceb40
Update Lib/email/policy.py
basbloemsaat Jul 16, 2024
aa4fd24
Update Misc/NEWS.d/next/Library/2024-07-15-21-43-38.gh-issue-121650.A…
basbloemsaat Jul 16, 2024
23fdf74
also check parsed headers for newlines and returns
basbloemsaat Jul 16, 2024
d210941
More specific update blurb
basbloemsaat Jul 16, 2024
118c709
Merge branch 'main' into fix-issue-121650-detect-newlines-in-headers
basbloemsaat Jul 16, 2024
08e5fe1
Merge branch 'main' into fix-issue-121650-detect-newlines-in-headers
basbloemsaat Jul 19, 2024
c5e9264
Merge branch 'fix-issue-121650-detect-newlines-in-headers' of github.…
basbloemsaat Jul 19, 2024
5a163b5
check all headers for newlines
basbloemsaat Jul 19, 2024
0efe290
Merge branch 'main' into fix-issue-121650-detect-newlines-in-headers
basbloemsaat Jul 22, 2024
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
8 changes: 4 additions & 4 deletions Lib/email/policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ def header_store_parse(self, name, value):
"""
if hasattr(value, 'name') and value.name.lower() == name.lower():
return (name, value)
if isinstance(value, str) and len(value.splitlines())>1:
# XXX this error message isn't quite right when we use splitlines
# (see issue 22233), but I'm not sure what should happen here.
if (isinstance(value, str) and
linesep_splitter.search(self.header_factory(name, value))
):
raise ValueError("Header values may not contain linefeed "
"or carriage return characters")
"or carriage return characters")
Comment thread
basbloemsaat marked this conversation as resolved.
Resolved
return (name, self.header_factory(name, value))

def header_fetch_parse(self, name, value):
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_email/test_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,13 @@ def test_header_store_parse_rejects_newlines(self):
instance.header_store_parse,
'From', 'spam\negg@foo.py')

self.assertRaises(ValueError,
instance.header_store_parse,
'Subject', 'te\nst')

self.assertRaises(ValueError,
instance.header_store_parse,
'Subject', 'A 💩 subject=?UTF-8?Q?=0A?=Bcc: injected@example.com')

if __name__ == '__main__':
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-07-15-21-43-38.gh-issue-121650.A0FkCh.rst
View file
Open in desktop
Comment thread
basbloemsaat marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes newlines (and carriage returns) in email headers, both at the end of
Comment thread
basbloemsaat marked this conversation as resolved.
Resolved
the header, and encoded entities that are resolved to newlines and returns