Enhance filename encoding in multipart/form-data (HTTPCLIENT-2360) #618
Conversation
| * @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?
arturobernalg
force-pushed
the
HTTPCLIENT-2360
branch
from
c5a947b to
02bbaf7
Compare
HI @ok2c fair enough. I’ve made the changes as recommended. Please take another pass. |
| * Reusable encoder for ISO-8859-1 charset checks, improving performance by avoiding | ||
| * repeated instance creation. | ||
| */ | ||
| private final CharsetEncoder iso8859_1Encoder = StandardCharsets.ISO_8859_1.newEncoder(); |
There was a problem hiding this comment.
@arturobernalg I would instantiate this attribute lazily. It does not need to be final. Looks good overall.
…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.
arturobernalg
force-pushed
the
HTTPCLIENT-2360
branch
from
b8fc8b5 to
6294189
Compare
|
@arturobernalg While you are at it, do you think you could remove the code that randomly generates boundary values with a fixed boundary and update the javadocs to instruct the users to use generate their own boundary values if they want them to be random / non-predictable / 'secure'? |
@ok2c sure. I'll do |
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.