Enhance filename encoding in multipart/form-data (HTTPCLIENT-2360) #618
Conversation
This file contains 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
…r RFC 6266/5987 - Modified FormBodyPartBuilder to support HttpMultipartMode, adding filename* with UTF-8 encoding for non-ISO-8859-1 filenames in STRICT/EXTENDED modes, skipping it in LEGACY mode. - Updated HttpRFC7578Multipart to use mode for filename encoding: percent-encode in EXTENDED, ISO-8859-1 in STRICT/LEGACY, and always encode filename* per RFC 5987. - Adjusted MultipartEntityBuilder to propagate mode to FormBodyPartBuilder, ensuring consistent behavior across the pipeline. - Fixed tests to align with mode-specific expectations, maintaining LEGACY mode’s raw UTF-8 filename behavior.
ok2c
reviewed
Feb 25, 2025
| * @return this builder instance for method chaining | ||
| * @since 5.5 | ||
| */ | ||
| public FormBodyPartBuilder setMode(final HttpMultipartMode mode) { |
There was a problem hiding this comment.
@arturobernalg Would not it be better to pass this parameter at the construction time to #create method?
| * @since 5.5 | ||
| */ | ||
| private static boolean canEncodeToISO8859_1(final String input) { | ||
| return StandardCharsets.ISO_8859_1.newEncoder().canEncode(input); |
There was a problem hiding this comment.
@arturobernalg Let's make the method non-static re-use the encoder rather than creating a new instance with every invocation
| @@ -295,11 +295,11 @@ void testMultipartFormBrowserCompatibleNonASCIIHeaders() throws Exception { | |||
| @SuppressWarnings("resource") | |||
| final FormBodyPart p1 = FormBodyPartBuilder.create( | |||
| "field1", | |||
| new InputStreamBody(new FileInputStream(tmpfile), s1 + ".tmp")).build(); | |||
| new InputStreamBody(new FileInputStream(tmpfile), s1 + ".tmp")).setMode(HttpMultipartMode.LEGACY).build(); | |||
There was a problem hiding this comment.
@arturobernalg Would not it look better as a #create parameter?
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.
Implements RFC 6266/5987 filename encoding in multipart/form-data. Adds mode-aware support in FormBodyPartBuilder and HttpRFC7578Multipart, propagates mode via MultipartEntityBuilder, and updates tests. Resolves https://issues.apache.org/jira/browse/HTTPCLIENT-2360.