spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 14:09:25 +00:00
Code Issues Projects Releases Wiki Activity

Refine error handling in MultipartParser

Browse Source 
Closes gh-36947
This commit is contained in:
rstoyanchev
2026-06-17 15:54:48 +01:00
parent 7b31e0c2dc
commit 8e6b6c5ac3
4 changed files with 96 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/http/converter/multipart/MultipartHttpMessageConverterTests.java
+1 -1
View File
@@ -200,7 +200,7 @@ class MultipartHttpMessageConverterTests {
void readMultipartInvalid() throws Exception {
MockHttpInputMessage response = createMultipartResponse("garbage-1.multipart", "boundary");
assertThatThrownBy(() -> converter.read(ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, Part.class), response, null))
.isInstanceOf(HttpMessageConversionException.class).hasMessage("Cannot decode multipart body");
.isInstanceOf(HttpMessageConversionException.class).hasMessage("Could not find first boundary");
}
@Test
spring-web/src/test/java/org/springframework/http/converter/multipart/MultipartParserTests.java
+13 -4
View File
@@ -38,6 +38,7 @@ import org.springframework.http.converter.HttpMessageConversionException;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/**
* Tests for {@link MultipartParser}.
@@ -74,7 +75,9 @@ class MultipartParserTests {
@Test
void noEndBoundary() throws Exception {
TestListener listener = new TestListener();
parse("no-end-boundary.multipart", "boundary", listener);
assertThatThrownBy(() -> parse("no-end-boundary.multipart", "boundary", listener))
.isInstanceOf(HttpMessageConversionException.class)
.hasMessage("Could not find end of headers");
assertThat(listener.error).isInstanceOf(HttpMessageConversionException.class);
}
@@ -82,7 +85,9 @@ class MultipartParserTests {
@Test
void garbage() throws Exception {
TestListener listener = new TestListener();
parse("garbage-1.multipart", "boundary", listener);
assertThatThrownBy(() -> parse("garbage-1.multipart", "boundary", listener))
.isInstanceOf(HttpMessageConversionException.class)
.hasMessage("Could not find first boundary");
assertThat(listener.error).isInstanceOf(HttpMessageConversionException.class);
}
@@ -90,7 +95,9 @@ class MultipartParserTests {
@Test
void noEndHeader() throws Exception {
TestListener listener = new TestListener();
parse("no-end-header.multipart", "boundary", listener);
assertThatThrownBy(() -> parse("no-end-header.multipart", "boundary", listener))
.isInstanceOf(HttpMessageConversionException.class)
.hasMessage("Could not find end of headers");
assertThat(listener.error).isInstanceOf(HttpMessageConversionException.class);
}
@@ -98,7 +105,9 @@ class MultipartParserTests {
@Test
void noEndBody() throws Exception {
TestListener listener = new TestListener();
parse("no-end-body.multipart", "boundary", listener);
assertThatThrownBy(() -> parse("no-end-body.multipart", "boundary", listener))
.isInstanceOf(HttpMessageConversionException.class)
.hasMessage("Could not find end of body (␍␊--boundary)");
assertThat(listener.error).isInstanceOf(HttpMessageConversionException.class);
}