Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression in HttpPutFormContentFilter

Browse Source 
Re-arrange the checks so that if there is no form parameter, then
immediately and unconditionally delegate to super.getParameterValues().
Or reversely if there is no super.getParameterValues() then return the
form parameter.

So the only remaining case is when combining values present in both.
In that case we'll take both only if a queryString exists.

One extra fix is to not even wrap the request if we did not parse any
form parameters at all which can happen with HttpHiddenMethodFilter.

Issue: SPR-15828, 15835
This commit is contained in:
Rossen Stoyanchev
2017-08-01 12:41:45 +02:00
parent 5f07434360
commit 35248498ae
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
View File

@@ -97,13 +97,15 @@ public class HttpPutFormContentFilter extends OncePerRequestFilter {
return request.getInputStream();
}
};
MultiValueMap<String, String> formParameters = formConverter.read(null, inputMessage);
HttpServletRequest wrapper = new HttpPutFormContentRequestWrapper(request, formParameters);
filterChain.doFilter(wrapper, response);
}
else {
filterChain.doFilter(request, response);
MultiValueMap<String, String> formParameters = this.formConverter.read(null, inputMessage);
if (!formParameters.isEmpty()) {
HttpServletRequest wrapper = new HttpPutFormContentRequestWrapper(request, formParameters);
filterChain.doFilter(wrapper, response);
return;
}
}
filterChain.doFilter(request, response);
}
private boolean isFormContentType(HttpServletRequest request) {
@@ -160,17 +162,17 @@ public class HttpPutFormContentFilter extends OncePerRequestFilter {
@Override
public String[] getParameterValues(String name) {
String[] queryParam = (super.getQueryString() != null ? super.getParameterValues(name) : null);
String[] parameterValues = super.getParameterValues(name);
List<String> formParam = this.formParameters.get(name);
if (formParam == null) {
return queryParam;
return parameterValues;
}
else if (queryParam == null) {
if (parameterValues == null || getQueryString() == null) {
return formParam.toArray(new String[formParam.size()]);
}
else {
List<String> result = new ArrayList<String>(queryParam.length + formParam.size());
result.addAll(Arrays.asList(queryParam));
List<String> result = new ArrayList<String>(parameterValues.length + formParam.size());
result.addAll(Arrays.asList(parameterValues));
result.addAll(formParam);
return result.toArray(new String[result.size()]);
}