Fix semicolon parsing in ContentDisposition - #205
Open
kukushechkin wants to merge 2 commits into
Open
Conversation
czechboy0
reviewed
Aug 18, 2026
|
|
||
| /// Wraps a parameter value in quotes, escaping backslashes and double quotes. | ||
| private static func quote(_ value: String) -> String { | ||
| "\"" + value.replacingOccurrences(of: "\\", with: "\\\\").replacingOccurrences(of: "\"", with: "\\\"") + "\"" |
Contributor
There was a problem hiding this comment.
Suggested change
| "\"" + value.replacingOccurrences(of: "\\", with: "\\\\").replacingOccurrences(of: "\"", with: "\\\"") + "\"" | |
| #"""# + value.replacingOccurrences(of: #"\"#, with: #"\\"#).replacingOccurrences(of: #"""#, with: #"\""#) + #"""# |
| var iterator = rawValue.makeIterator() | ||
| while let character = iterator.next() { | ||
| switch character { | ||
| case "\\" where isInsideQuotedString: |
Contributor
There was a problem hiding this comment.
Suggested change
| case "\\" where isInsideQuotedString: | |
| case #"\"# where isInsideQuotedString: |
| case "\\" where isInsideQuotedString: | ||
| current.append(character) | ||
| if let escaped = iterator.next() { current.append(escaped) } | ||
| case "\"": |
Contributor
There was a problem hiding this comment.
Suggested change
| case "\"": | |
| case #"""#: |
|
|
||
| /// Removes surrounding quotes and resolves backslash-escaped characters in a parameter value. | ||
| private static func unquote(_ value: String) -> String { | ||
| guard value.count >= 2, value.first == "\"", value.last == "\"" else { return value } |
Contributor
There was a problem hiding this comment.
Suggested change
| guard value.count >= 2, value.first == "\"", value.last == "\"" else { return value } | |
| guard value.count >= 2, value.first == #"""#, value.last == #"""# else { return value } |
Comment on lines
+132
to
+133
| return value.dropFirst().dropLast().replacingOccurrences(of: "\\\"", with: "\"") | ||
| .replacingOccurrences(of: "\\\\", with: "\\") |
Contributor
There was a problem hiding this comment.
Suggested change
| return value.dropFirst().dropLast().replacingOccurrences(of: "\\\"", with: "\"") | |
| .replacingOccurrences(of: "\\\\", with: "\\") | |
| return value.dropFirst().dropLast().replacingOccurrences(of: #"\""#, with: #"""#) | |
| .replacingOccurrences(of: #"\\"#, with: #"\"#) |
Comment on lines
+113
to
+115
| case "\\" where isInsideQuotedString: | ||
| current.append(character) | ||
| if let escaped = iterator.next() { current.append(escaped) } |
Contributor
There was a problem hiding this comment.
Can you help me understand this section better? I don't quite follow - we don't transform the characters, we just add them back as they were.
| XCTAssertEqual(stateMachine.next(parts[0]), .emitError(.receivedMultipleValuesForSingleValuePart("name"))) | ||
| } | ||
|
|
||
| func testFilenameContainingQuoteAndSemicolon() throws { |
Contributor
There was a problem hiding this comment.
What does this test on top of what you added to Test_ContentDisposition.swift?
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
2 participants
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.
Motivation
Unconditional split at
;splitsfilenamevalue into multiple (usually broken) params.Modifications
Correctly track quotes in
ContentDispositionparam and inly split params at high-level semicolon.Result
Filenames with semicolons are parsed correctly.
Test Plan
Unit tests.