escape crlf and quotes in multipart Content-Disposition headers#3417
Merged
velo merged 1 commit intoJun 17, 2026
Merged
Conversation
Contributor
|
This needs to be backported to #3414 |
yvasyliev
approved these changes
Jun 15, 2026
Contributor
Author
|
Backported to |
velo
approved these changes
Jun 17, 2026
velo
left a comment
Member
There was a problem hiding this comment.
This covers the non-streaming multipart writer path well: parameter names and filenames are escaped before they reach Content-Disposition, with regression tests for the injection cases. Checks are green and the change is compatible.
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
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.
Repro: send a multipart request whose
FormData.fileName(or aFilename / field name) contains"or a CRLF, e.g.evil"\r\nX-Injected: 1.Cause:
AbstractWriter.writeFileMetadataandSingleParameterWriterappend the field name and file name straight into the quotedContent-Dispositionparameters, so the value can close the quote and start a new header line or part.Fix: percent-encode
\r,\nand"in those parameters inside the writer, matching the WHATWGmultipart/form-dataencoding rules. AddedAbstractWriterTestcovering an injected file name and field name.