GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Consistently accept empty Content-Type header and empty character encoding 

Issue: SPR-12173
pull/661/merge
Juergen Hoeller 11 years ago
parent
2df03d6316
commit
d501137f4e
4 changed files with 65 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
  2. 32
      spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
  3. 27
      spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
  4. 9
      spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java

28
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
Unescape View File

@ -36,7 +36,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.servlet.AsyncContext; import javax.servlet.AsyncContext;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
@ -58,12 +57,11 @@ import org.springframework.util.StringUtils;
/** /**
* Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface. * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface.
* *
* <p>The default, preferred {@link Locale} for the <em>server</em> mocked * <p>The default, preferred {@link Locale} for the <em>server</em> mocked by this request
* by this request is {@link Locale#ENGLISH}. This value can be changed * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale}
* via {@link #addPreferredLocale} or {@link #setPreferredLocales}. * or {@link #setPreferredLocales}.
* *
* <p>As of Spring Framework 4.0, this set of mocks is designed on a Servlet * <p>As of Spring Framework 4.0, this set of mocks is designed on a Servlet 3.0 baseline.
* 3.0 baseline.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Rod Johnson * @author Rod Johnson
@ -344,9 +342,10 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
private void updateContentTypeHeader() { private void updateContentTypeHeader() {
if (this.contentType != null) { if (StringUtils.hasLength(this.contentType)) {
StringBuilder sb = new StringBuilder(this.contentType); StringBuilder sb = new StringBuilder(this.contentType);
if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && this.characterEncoding != null) { if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) &&
StringUtils.hasLength(this.characterEncoding)) {
sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding); sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
} }
doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true); doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
@ -371,8 +370,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
if (contentType != null) { if (contentType != null) {
int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX); int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
if (charsetIndex != -1) { if (charsetIndex != -1) {
String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length()); this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
this.characterEncoding = encoding;
} }
updateContentTypeHeader(); updateContentTypeHeader();
} }
@ -708,8 +706,6 @@ public class MockHttpServletRequest implements HttpServletRequest {
/** /**
* Set the boolean {@code secure} flag indicating whether the mock request * Set the boolean {@code secure} flag indicating whether the mock request
* was made using a secure channel, such as HTTPS. * was made using a secure channel, such as HTTPS.
* @param secure a boolean indicating if the mock request was made using a
* secure channel
* @see #isSecure() * @see #isSecure()
* @see #getScheme() * @see #getScheme()
* @see #setScheme(String) * @see #setScheme(String)
@ -721,13 +717,11 @@ public class MockHttpServletRequest implements HttpServletRequest {
/** /**
* Returns {@code true} if the {@link #setSecure secure} flag has been set * Returns {@code true} if the {@link #setSecure secure} flag has been set
* to {@code true} or if the {@link #getScheme scheme} is {@code https}. * to {@code true} or if the {@link #getScheme scheme} is {@code https}.
* <p>
* {@inheritDoc}
* @see javax.servlet.ServletRequest#isSecure() * @see javax.servlet.ServletRequest#isSecure()
*/ */
@Override @Override
public boolean isSecure() { public boolean isSecure() {
return this.secure || HTTPS.equalsIgnoreCase(this.getScheme()); return (this.secure || HTTPS.equalsIgnoreCase(this.scheme));
} }
@Override @Override
@ -1040,8 +1034,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
public StringBuffer getRequestURL() { public StringBuffer getRequestURL() {
StringBuffer url = new StringBuffer(this.scheme).append("://").append(this.serverName); StringBuffer url = new StringBuffer(this.scheme).append("://").append(this.serverName);
if (this.serverPort > 0 if (this.serverPort > 0 && ((HTTP.equalsIgnoreCase(this.scheme) && this.serverPort != 80) ||
&& ((HTTP.equalsIgnoreCase(scheme) && this.serverPort != 80) || (HTTPS.equalsIgnoreCase(scheme) && this.serverPort != 443))) { (HTTPS.equalsIgnoreCase(this.scheme) && this.serverPort != 443))) {
url.append(':').append(this.serverPort); url.append(':').append(this.serverPort);
} }

32
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
Unescape View File

@ -30,7 +30,6 @@ import java.nio.charset.Charset;
import java.security.Principal; import java.security.Principal;
import java.util.Arrays; import java.util.Arrays;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -40,6 +39,8 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.LinkedCaseInsensitiveMap;
import org.springframework.util.StringUtils;
/** /**
* {@link ServerHttpRequest} implementation that is based on a {@link HttpServletRequest}. * {@link ServerHttpRequest} implementation that is based on a {@link HttpServletRequest}.
@ -111,21 +112,30 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
} }
} }
// HttpServletRequest exposes some headers as properties: we should include those if not already present // HttpServletRequest exposes some headers as properties: we should include those if not already present
if (this.headers.getContentType() == null && this.servletRequest.getContentType() != null) { MediaType contentType = this.headers.getContentType();
MediaType contentType = MediaType.parseMediaType(this.servletRequest.getContentType()); if (contentType == null) {
String requestContentType = this.servletRequest.getContentType();
if (StringUtils.hasLength(requestContentType)) {
contentType = MediaType.parseMediaType(requestContentType);
this.headers.setContentType(contentType); this.headers.setContentType(contentType);
} }
if (this.headers.getContentType() != null && this.headers.getContentType().getCharSet() == null && }
this.servletRequest.getCharacterEncoding() != null) { if (contentType != null && contentType.getCharSet() == null) {
MediaType oldContentType = this.headers.getContentType(); String requestEncoding = this.servletRequest.getCharacterEncoding();
Charset charSet = Charset.forName(this.servletRequest.getCharacterEncoding()); if (StringUtils.hasLength(requestEncoding)) {
Map<String, String> params = new HashMap<String, String>(oldContentType.getParameters()); Charset charSet = Charset.forName(requestEncoding);
Map<String, String> params = new LinkedCaseInsensitiveMap<String>();
params.putAll(contentType.getParameters());
params.put("charset", charSet.toString()); params.put("charset", charSet.toString());
MediaType newContentType = new MediaType(oldContentType.getType(), oldContentType.getSubtype(), params); MediaType newContentType = new MediaType(contentType.getType(), contentType.getSubtype(), params);
this.headers.setContentType(newContentType); this.headers.setContentType(newContentType);
} }
if (this.headers.getContentLength() == -1 && this.servletRequest.getContentLength() != -1) { }
this.headers.setContentLength(this.servletRequest.getContentLength()); if (this.headers.getContentLength() == -1) {
int requestContentLength = this.servletRequest.getContentLength();
if (requestContentLength != -1) {
this.headers.setContentLength(requestContentLength);
}
} }
} }
return this.headers; return this.headers;

27
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,6 +22,7 @@ import java.util.List;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -39,12 +40,14 @@ public class ServletServerHttpRequestTests {
private MockHttpServletRequest mockRequest; private MockHttpServletRequest mockRequest;
@Before @Before
public void create() throws Exception { public void create() throws Exception {
mockRequest = new MockHttpServletRequest(); mockRequest = new MockHttpServletRequest();
request = new ServletServerHttpRequest(mockRequest); request = new ServletServerHttpRequest(mockRequest);
} }
@Test @Test
public void getMethod() throws Exception { public void getMethod() throws Exception {
mockRequest.setMethod("POST"); mockRequest.setMethod("POST");
@ -65,8 +68,8 @@ public class ServletServerHttpRequestTests {
public void getHeaders() throws Exception { public void getHeaders() throws Exception {
String headerName = "MyHeader"; String headerName = "MyHeader";
String headerValue1 = "value1"; String headerValue1 = "value1";
mockRequest.addHeader(headerName, headerValue1);
String headerValue2 = "value2"; String headerValue2 = "value2";
mockRequest.addHeader(headerName, headerValue1);
mockRequest.addHeader(headerName, headerValue2); mockRequest.addHeader(headerName, headerValue2);
mockRequest.setContentType("text/plain"); mockRequest.setContentType("text/plain");
mockRequest.setCharacterEncoding("UTF-8"); mockRequest.setCharacterEncoding("UTF-8");
@ -82,6 +85,26 @@ public class ServletServerHttpRequestTests {
headers.getContentType()); headers.getContentType());
} }
@Test
public void getHeadersWithEmptyContentTypeAndEncoding() throws Exception {
String headerName = "MyHeader";
String headerValue1 = "value1";
String headerValue2 = "value2";
mockRequest.addHeader(headerName, headerValue1);
mockRequest.addHeader(headerName, headerValue2);
mockRequest.setContentType("");
mockRequest.setCharacterEncoding("");
HttpHeaders headers = request.getHeaders();
assertNotNull("No HttpHeaders returned", headers);
assertTrue("Invalid headers returned", headers.containsKey(headerName));
List<String> headerValues = headers.get(headerName);
assertEquals("Invalid header values returned", 2, headerValues.size());
assertTrue("Invalid header values returned", headerValues.contains(headerValue1));
assertTrue("Invalid header values returned", headerValues.contains(headerValue2));
assertNull(headers.getContentType());
}
@Test @Test
public void getBody() throws Exception { public void getBody() throws Exception {
byte[] content = "Hello World".getBytes("UTF-8"); byte[] content = "Hello World".getBytes("UTF-8");

9
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
Unescape View File

@ -36,7 +36,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.servlet.AsyncContext; import javax.servlet.AsyncContext;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
@ -336,9 +335,10 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
private void updateContentTypeHeader() { private void updateContentTypeHeader() {
if (this.contentType != null) { if (StringUtils.hasLength(this.contentType)) {
StringBuilder sb = new StringBuilder(this.contentType); StringBuilder sb = new StringBuilder(this.contentType);
if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && this.characterEncoding != null) { if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) &&
StringUtils.hasLength(this.characterEncoding)) {
sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding); sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
} }
doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true); doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
@ -363,8 +363,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
if (contentType != null) { if (contentType != null) {
int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX); int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
if (charsetIndex != -1) { if (charsetIndex != -1) {
String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length()); this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
this.characterEncoding = encoding;
} }
updateContentTypeHeader(); updateContentTypeHeader();
} }

Write Preview
Loading…
Cancel
Save