FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.12] gh-143935: Email preserve parens when folding comments (GH-143936) by miss-islington · Pull Request #144036 · python/cpython · GitHub

/ cpython Public

[3.12] gh-143935: Email preserve parens when folding comments (GH-143936) #144036

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
pablogsal merged 2 commits into from
Jan 26, 2026
+43 −1
Conversation 0 Commits 2 Checks 24 Files changed 3
Merged

[3.12] gh-143935: Email preserve parens when folding comments (GH-143936) #144036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3900a2c
gh-143935: Email preserve parens when folding comments (GH-143936)
sethmlarson Jan 19, 2026
b7ab26f
Merge branch '3.12' into backport-17d1490-3.12
pablogsal Jan 25, 2026
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 14 additions & 1 deletion Lib/email/_header_value_parser.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ def make_quoted_pairs(value):
return str(value).replace('\\', '\\\\').replace('"', '\\"')


def make_parenthesis_pairs(value):
"""Escape parenthesis and backslash for use within a comment."""
return str(value).replace('\\', '\\\\') \
.replace('(', '\\(').replace(')', '\\)')


def quote_string(value):
escaped = make_quoted_pairs(value)
return f'"{escaped}"'
Expand Down Expand Up @@ -933,7 +939,7 @@ def value(self):
return ' '

def startswith_fws(self):
return True
return self and self[0] in WSP


class ValueTerminal(Terminal):
Expand Down Expand Up @@ -2922,6 +2928,13 @@ def _refold_parse_tree(parse_tree, *, policy):
[ValueTerminal(make_quoted_pairs(p), 'ptext')
for p in newparts] +
[ValueTerminal('"', 'ptext')])
if part.token_type == 'comment':
newparts = (
[ValueTerminal('(', 'ptext')] +
[ValueTerminal(make_parenthesis_pairs(p), 'ptext')
if p.token_type == 'ptext' else p
for p in newparts] +
[ValueTerminal(')', 'ptext')])
if not part.as_ew_allowed:
wrap_as_ew_blocked += 1
newparts.append(end_ew_not_allowed)
Expand Down
23 changes: 23 additions & 0 deletions Lib/test/test_email/test__header_value_parser.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3141,6 +3141,29 @@ def test_address_list_with_specials_in_long_quoted_string(self):
with self.subTest(to=to):
self._test(parser.get_address_list(to)[0], folded, policy=policy)

def test_address_list_with_long_unwrapable_comment(self):
policy = self.policy.clone(max_line_length=40)
cases = [
# (to, folded)
('(loremipsumdolorsitametconsecteturadipi)<spy@example.org>',
'(loremipsumdolorsitametconsecteturadipi)<spy@example.org>\n'),
('<spy@example.org>(loremipsumdolorsitametconsecteturadipi)',
'<spy@example.org>(loremipsumdolorsitametconsecteturadipi)\n'),
('(loremipsum dolorsitametconsecteturadipi)<spy@example.org>',
'(loremipsum dolorsitametconsecteturadipi)<spy@example.org>\n'),
('<spy@example.org>(loremipsum dolorsitametconsecteturadipi)',
'<spy@example.org>(loremipsum\n dolorsitametconsecteturadipi)\n'),
('(Escaped \\( \\) chars \\\\ in comments stay escaped)<spy@example.org>',
'(Escaped \\( \\) chars \\\\ in comments stay\n escaped)<spy@example.org>\n'),
('((loremipsum)(loremipsum)(loremipsum)(loremipsum))<spy@example.org>',
'((loremipsum)(loremipsum)(loremipsum)(loremipsum))<spy@example.org>\n'),
('((loremipsum)(loremipsum)(loremipsum) (loremipsum))<spy@example.org>',
'((loremipsum)(loremipsum)(loremipsum)\n (loremipsum))<spy@example.org>\n'),
]
for (to, folded) in cases:
with self.subTest(to=to):
self._test(parser.get_address_list(to)[0], folded, policy=policy)

# XXX Need tests with comments on various sides of a unicode token,
# and with unicode tokens in the comments. Spaces inside the quotes
# currently don't do the right thing.
Expand Down
6 changes: 6 additions & 0 deletions Misc/NEWS.d/next/Security/2026-01-16-14-40-31.gh-issue-143935.U2YtKl.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Fixed a bug in the folding of comments when flattening an email message
using a modern email policy. Comments consisting of a very long sequence of
non-foldable characters could trigger a forced line wrap that omitted the
required leading space on the continuation line, causing the remainder of
the comment to be interpreted as a new header field. This enabled header
injection with carefully crafted inputs.
Back | FazBrowse Home | New Git URL