Skip to content
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

FormHttpMessageConverter should throw HttpMessageNotReadableException when the http form data is invalid #34594

Closed
wants to merge 1 commit into from
Closed

FormHttpMessageConverter should throw HttpMessageNotReadableException when the http form data is invalid #34594

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
18 changes: 14 additions & 4 deletions spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,12 +353,22 @@ public MultiValueMap<String, String> read(@Nullable Class<? extends MultiValueMa
for (String pair : pairs) {
int idx = pair.indexOf('=');
if (idx == -1) {
result.add(URLDecoder.decode(pair, charset), null);
try {
result.add(URLDecoder.decode(pair, charset), null);
}
catch (IllegalArgumentException ex) {
throw new HttpMessageNotReadableException("Could not decode HTTP form payload", ex, inputMessage);
}
}
else {
String name = URLDecoder.decode(pair.substring(0, idx), charset);
String value = URLDecoder.decode(pair.substring(idx + 1), charset);
result.add(name, value);
try {
String name = URLDecoder.decode(pair.substring(0, idx), charset);
String value = URLDecoder.decode(pair.substring(idx + 1), charset);
result.add(name, value);
}
catch (IllegalArgumentException ex) {
throw new HttpMessageNotReadableException("Could not decode HTTP form payload", ex, inputMessage);
}
}
}
return result;
Expand Down
33 changes: 33 additions & 0 deletions ...g-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED;
import static org.springframework.http.MediaType.APPLICATION_JSON;
import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
Expand Down Expand Up @@ -132,6 +133,27 @@ void readForm() throws Exception {
assertThat(result.getFirst("name 3")).as("Invalid result").isNull();
}

@Test
void readInvalidFormWithValueThatWontUrlDecode() {
//java.net.URLDecoder doesn't like negative integer values after a % character
String body = "name+1=value+1&name+2=value+2%" + ((char)-1);
assertInvalidFormIsRejectedWithSpecificException(body);
}

@Test
void readInvalidFormWithNameThatWontUrlDecode() {
//java.net.URLDecoder doesn't like negative integer values after a % character
String body = "name+1=value+1&name+2%" + ((char)-1) + "=value+2";
assertInvalidFormIsRejectedWithSpecificException(body);
}

@Test
void readInvalidFormWithNameWithNoValueThatWontUrlDecode() {
//java.net.URLDecoder doesn't like negative integer values after a % character
String body = "name+1=value+1&name+2%" + ((char)-1);
assertInvalidFormIsRejectedWithSpecificException(body);
}

@Test
void writeForm() throws IOException {
MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
Expand Down Expand Up @@ -410,6 +432,17 @@ private void assertCannotWrite(MediaType mediaType) {
assertThat(this.converter.canWrite(clazz, mediaType)).as(clazz.getSimpleName() + " : " + mediaType).isFalse();
}

private void assertInvalidFormIsRejectedWithSpecificException(String body) {
MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.ISO_8859_1));
inputMessage.getHeaders().setContentType(
new MediaType("application", "x-www-form-urlencoded", StandardCharsets.ISO_8859_1));

assertThatThrownBy(() -> this.converter.read(null, inputMessage))
.isInstanceOf(HttpMessageNotReadableException.class)
.hasCauseInstanceOf(IllegalArgumentException.class)
.hasMessage("Could not decode HTTP form payload");
}


private static class MockHttpOutputMessageRequestContext implements UploadContext {

Expand Down