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

Fix MockCookie parsing when attribute is omitted 

Issue: SPR-17321, #1974
This commit is contained in:
Michael Bell 2018-10-02 03:18:45 -07:00 committed by Sam Brannen
parent 00353a073c
commit 1b8421c7fe
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
View File

@ -80,7 +80,7 @@ public class MockCookie extends Cookie {
String name = cookieParts[0]; String name = cookieParts[0];
String[] valueAndDirectives = cookieParts[1].split("\\s*;\\s*", 2); String[] valueAndDirectives = cookieParts[1].split("\\s*;\\s*", 2);
String value = valueAndDirectives[0]; String value = valueAndDirectives[0];
String[] directives = valueAndDirectives[1].split("\\s*;\\s*"); String[] directives = valueAndDirectives.length > 1 ? valueAndDirectives[1].split("\\s*;\\s*") : new String[0];
MockCookie cookie = new MockCookie(name, value); MockCookie cookie = new MockCookie(name, value);
for (String directive : directives) { for (String directive : directives) {

23
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@ -544,6 +544,29 @@ public class MockHttpServletRequestTests {
request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE); request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE);
} }
@Test
public void testCookieParsing() {
MockCookie m = MockCookie.parse("foo=bar");
testCookie("foo", "bar", m);
m = MockCookie.parse("foo=bar;");
assertFalse(m.isHttpOnly());
assertFalse(m.getSecure());
testCookie("foo", "bar", m);
m = MockCookie.parse("foo=bar; HttpOnly");
testCookie("foo", "bar", m);
assertTrue(m.isHttpOnly());
assertFalse(m.getSecure());
m = MockCookie.parse("foo=bar; Secure");
testCookie("foo", "bar", m);
assertTrue(m.getSecure());
assertFalse(m.isHttpOnly());
}
private void testCookie(String name, String value, MockCookie mockCookie) {
assertEquals(name, mockCookie.getName());
assertEquals(value, mockCookie.getValue());
}
private void assertEqualEnumerations(Enumeration<?> enum1, Enumeration<?> enum2) { private void assertEqualEnumerations(Enumeration<?> enum1, Enumeration<?> enum2) {
assertNotNull(enum1); assertNotNull(enum1);