Skip to content

Read quoted and mixed-case charset parameters in FormEncoder #3611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdelay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Read quoted and mixed-case charset parameters in FormEncoder #3611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion form/src/main/java/feign/form/FormEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class FormEncoder implements Encoder {

static {
CONTENT_TYPE_HEADER = "Content-Type";
CHARSET_PATTERN = Pattern.compile("(?<=charset=)([\\w\\-]+)");
CHARSET_PATTERN = Pattern.compile("(?<=charset=)\"?([\\w\\-]+)", Pattern.CASE_INSENSITIVE);
}

Encoder delegate;
Expand Down
30 changes: 30 additions & 0 deletions form/src/test/java/feign/form/FormEncoderCharsetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,34 @@ void unsupportedCharsetInContentTypeFallsBackToUtf8() {

assertThat(new String(template.body(), StandardCharsets.UTF_8)).isEqualTo("foo=bar");
}

@Test
void charsetParameterNameIsCaseInsensitive() {
RequestTemplate template = new RequestTemplate();
template.header("Content-Type", "application/x-www-form-urlencoded; Charset=ISO-8859-1");

Map<String, Object> data = new LinkedHashMap<>();
data.put("name", "é");

new FormEncoder().encode(data, Map.class, template);

assertThat(new String(template.body(), StandardCharsets.ISO_8859_1)).isEqualTo("name=%E9");
assertThat(template.headers().get("Content-Type"))
.containsExactly("application/x-www-form-urlencoded; charset=ISO-8859-1");
}

@Test
void quotedCharsetParameterIsHonored() {
RequestTemplate template = new RequestTemplate();
template.header("Content-Type", "application/x-www-form-urlencoded; charset=\"ISO-8859-1\"");

Map<String, Object> data = new LinkedHashMap<>();
data.put("name", "é");

new FormEncoder().encode(data, Map.class, template);

assertThat(new String(template.body(), StandardCharsets.ISO_8859_1)).isEqualTo("name=%E9");
assertThat(template.headers().get("Content-Type"))
.containsExactly("application/x-www-form-urlencoded; charset=ISO-8859-1");
}
}