Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,8 @@ else if (hasMultipartException(request)) {
return this.multipartResolver.resolveMultipart(request);
}
catch (MultipartException ex) {
if (request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) != null) {
if (request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) != null ||
DispatcherType.ERROR.equals(request.getDispatcherType())) {
logger.debug("Multipart resolution failed for error dispatch", ex);
// Keep processing error dispatch with regular request handle below
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.web.servlet;

import java.io.IOException;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
Expand Down Expand Up @@ -77,6 +78,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

/**
* Tests for {@link DispatcherServlet}.
Expand Down Expand Up @@ -275,6 +277,33 @@ void multipartResolutionFailed() throws Exception {
.isInstanceOf(MaxUploadSizeExceededException.class);
}

@Test
void multipartResolutionFailureOnErrorDispatchDoesNotReplaceRequest() throws Exception {
DispatcherServlet servlet = new DispatcherServlet();
MultipartResolver multipartResolver = mock(MultipartResolver.class);
setMultipartResolver(servlet, multipartResolver);
MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "POST", "/upload");
request.setDispatcherType(DispatcherType.ERROR);
when(multipartResolver.isMultipart(request)).thenReturn(true);
when(multipartResolver.resolveMultipart(request)).thenThrow(new MaxUploadSizeExceededException(1024));

assertThat(servlet.checkMultipart(request)).isSameAs(request);
}

@Test
void multipartResolutionFailureOnRequestDispatchIsNotSuppressed() throws Exception {
DispatcherServlet servlet = new DispatcherServlet();
MultipartResolver multipartResolver = mock(MultipartResolver.class);
setMultipartResolver(servlet, multipartResolver);
MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "POST", "/upload");
request.setDispatcherType(DispatcherType.REQUEST);
when(multipartResolver.isMultipart(request)).thenReturn(true);
when(multipartResolver.resolveMultipart(request)).thenThrow(new MaxUploadSizeExceededException(1024));

assertThatThrownBy(() -> servlet.checkMultipart(request))
.isInstanceOf(MaxUploadSizeExceededException.class);
}

@Test
void handlerInterceptorAbort() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/locale.do");
Expand Down Expand Up @@ -921,6 +950,14 @@ void shouldResetContentHeadersIfNotCommitted() throws Exception {
}


private static void setMultipartResolver(DispatcherServlet servlet, MultipartResolver multipartResolver)
throws ReflectiveOperationException {
Field field = DispatcherServlet.class.getDeclaredField("multipartResolver");
field.setAccessible(true);
field.set(servlet, multipartResolver);
}


public static class ControllerFromParent implements Controller {

@Override
Expand Down