root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-8688 Don't use Servlet request params for form 'PUT' in ServletServerHttpRequest.

This commit is contained in:
Rossen Stoyanchev 2011-09-20 09:18:47 +00:00
parent c257afa515
commit 7a3f02bce9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
View File

@ -31,6 +31,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -51,9 +52,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
private static final String METHOD_POST = "POST"; private static final String METHOD_POST = "POST";
private static final String METHOD_PUT = "PUT";
private final HttpServletRequest servletRequest; private final HttpServletRequest servletRequest;
private HttpHeaders headers; private HttpHeaders headers;
@ -107,20 +105,26 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
} }
public InputStream getBody() throws IOException { public InputStream getBody() throws IOException {
if (isFormSubmittal(this.servletRequest)) { if (isFormPost(this.servletRequest)) {
return getFormBody(this.servletRequest); return getBodyFromServletRequestParameters(this.servletRequest);
} }
else { else {
return this.servletRequest.getInputStream(); return this.servletRequest.getInputStream();
} }
} }
private boolean isFormSubmittal(HttpServletRequest request) { private boolean isFormPost(HttpServletRequest request) {
return request.getContentType() != null && request.getContentType().contains(FORM_CONTENT_TYPE) && return request.getContentType() != null && request.getContentType().contains(FORM_CONTENT_TYPE) &&
(METHOD_POST.equalsIgnoreCase(request.getMethod()) || METHOD_PUT.equalsIgnoreCase(request.getMethod())); (METHOD_POST.equalsIgnoreCase(request.getMethod()));
} }
private InputStream getFormBody(HttpServletRequest request) throws IOException { /**
* Use {@link ServletRequest#getParameterMap()} to reconstruct the body of
* a form 'POST' providing a predictable outcome as opposed to reading
* from the body, which can fail if any other code has used ServletRequest
* to access a parameter thus causing the input stream to be "consumed".
*/
private InputStream getBodyFromServletRequestParameters(HttpServletRequest request) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
Writer writer = new OutputStreamWriter(bos, FORM_CHARSET); Writer writer = new OutputStreamWriter(bos, FORM_CHARSET);