Skip to content

Strip CRLF from headers before parsing #68328

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Strip CRLF from headers before parsing #68328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changelog/68328.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed cp.cache_file when using Tornado > 6.4
2 changes: 1 addition & 1 deletion salt/fileclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ def on_header(hdr):
# Check the status line of the HTTP request
if write_body[0] is None:
try:
hdr = parse_response_start_line(hdr)
hdr = parse_response_start_line(hdr.strip())
Copy link
Contributor

@bdrx312 bdrx312 Sep 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hdr.strip() is also called back on like 688: if not hdr.strip() and "Content-Type" not in write_body[1]:. Maybe refactor this to an assignment stripped_hdr = hdr.strip() on line 685 and use stripped_hdr everywhere hdr is used.

Also can you rename this return variable to something like response_start? parse_response_start_line does not return a header and this is very confusing that we assign the response to the same hdr variable name. Or we could go ahead and split out the tuple since we only care about the code (_, code, *_) = parse_response_start_line(hdr.strip())

except HTTPInputError:
# Not the first line, do nothing
return
Expand Down
Loading