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

Consistently accept empty Content-Type header and empty character encoding

Browse Source 
Issue: SPR-12173
This commit is contained in:
Juergen Hoeller
2014-10-14 14:26:07 +02:00
parent 2df03d6316
commit d501137f4e
4 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
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");
* 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.Test;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
@@ -39,12 +40,14 @@ public class ServletServerHttpRequestTests {
private MockHttpServletRequest mockRequest;
@Before
public void create() throws Exception {
mockRequest = new MockHttpServletRequest();
request = new ServletServerHttpRequest(mockRequest);
}
@Test
public void getMethod() throws Exception {
mockRequest.setMethod("POST");
@@ -65,8 +68,8 @@ public class ServletServerHttpRequestTests {
public void getHeaders() throws Exception {
String headerName = "MyHeader";
String headerValue1 = "value1";
mockRequest.addHeader(headerName, headerValue1);
String headerValue2 = "value2";
mockRequest.addHeader(headerName, headerValue1);
mockRequest.addHeader(headerName, headerValue2);
mockRequest.setContentType("text/plain");
mockRequest.setCharacterEncoding("UTF-8");
@@ -82,6 +85,26 @@ public class ServletServerHttpRequestTests {
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
public void getBody() throws Exception {
byte[] content = "Hello World".getBytes("UTF-8");
@@ -105,4 +128,4 @@ public class ServletServerHttpRequestTests {
assertArrayEquals("Invalid content returned", content, result);
}
}
}

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

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