Strip CRLF from headers before parsing #68328
Open
Conversation
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
m-czernek
force-pushed
the
tornado_strip
branch
from
dc9355a to
7f49620
Compare
bdrx312
reviewed
Sep 15, 2025
| if write_body[0] is None: | ||
| try: | ||
| hdr = parse_response_start_line(hdr) | ||
| hdr = parse_response_start_line(hdr.strip()) |
There was a problem hiding this comment.
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())
twangboy
requested changes
Sep 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
After Tornado 6.4, 6.5 and later break compatibility in the
parse_response_start_line, which no longer accepts CRLF. See [0] for more information.This change ensures that fileclient tests (and functionality) do not break when you decide to upgrade Tornado :).
[0] tornadoweb/tornado#3540
What issues does this PR fix or reference?
Previous Behavior
Fileclient download functionality (used e.g. in
cp.cache_file) is broken with Tornado > 6.4.New Behavior
Fileclient download functionality works with Tornado > 6.4.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes