Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-24 13:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polish CookieRequestCacheTests

Browse Source 
Issue gh-8817
Issue gh-8820
This commit is contained in:
Eleftheria Stein 2020-07-21 14:48:35 +02:00
parent 41f26b768a
commit fb936e2780
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/src/test/java/org/springframework/security/web/savedrequest/CookieRequestCacheTests.java
View File

@ -18,7 +18,6 @@ package org.springframework.security.web.savedrequest;
import org.junit.Test; import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.util.StringUtils;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -39,7 +38,13 @@ public class CookieRequestCacheTests {
public void saveRequestWhenMatchesThenSavedRequestInACookieOnResponse() { public void saveRequestWhenMatchesThenSavedRequestInACookieOnResponse() {
CookieRequestCache cookieRequestCache = new CookieRequestCache(); CookieRequestCache cookieRequestCache = new CookieRequestCache();
MockHttpServletRequest request = requestToSave(); MockHttpServletRequest request = new MockHttpServletRequest();
request.setServerPort(443);
request.setSecure(true);
request.setScheme("https");
request.setServerName("abc.com");
request.setRequestURI("/destination");
request.setQueryString("param1=a&param2=b&param3=1122");
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
cookieRequestCache.saveRequest(request, response); cookieRequestCache.saveRequest(request, response);
@ -51,10 +56,9 @@ public class CookieRequestCacheTests {
assertThat(redirectUrl).isEqualTo("https://abc.com/destination?param1=a&param2=b&param3=1122"); assertThat(redirectUrl).isEqualTo("https://abc.com/destination?param1=a&param2=b&param3=1122");
assertThat(savedCookie.getMaxAge()).isEqualTo(-1); assertThat(savedCookie.getMaxAge()).isEqualTo(-1);
assertThat(savedCookie.getPath()).isEqualTo(StringUtils.isEmpty(request.getContextPath()) ? "/" : request.getContextPath()); assertThat(savedCookie.getPath()).isEqualTo("/");
assertThat(savedCookie.isHttpOnly()).isTrue(); assertThat(savedCookie.isHttpOnly()).isTrue();
assertThat(savedCookie.getSecure()).isTrue(); assertThat(savedCookie.getSecure()).isTrue();
} }
@Test @Test
@ -118,13 +122,18 @@ public class CookieRequestCacheTests {
HttpServletRequest matchingRequest = cookieRequestCache.getMatchingRequest(new MockHttpServletRequest(), response); HttpServletRequest matchingRequest = cookieRequestCache.getMatchingRequest(new MockHttpServletRequest(), response);
assertThat(matchingRequest).isNull(); assertThat(matchingRequest).isNull();
assertThat(response.getCookie(DEFAULT_COOKIE_NAME)).isNull(); assertThat(response.getCookie(DEFAULT_COOKIE_NAME)).isNull();
} }
@Test @Test
public void matchingRequestWhenRequestContainsSavedRequestCookieThenSetsAnExpiredCookieInResponse() { public void matchingRequestWhenRequestContainsSavedRequestCookieThenSetsAnExpiredCookieInResponse() {
CookieRequestCache cookieRequestCache = new CookieRequestCache(); CookieRequestCache cookieRequestCache = new CookieRequestCache();
MockHttpServletRequest request = requestToSave(); MockHttpServletRequest request = new MockHttpServletRequest();
request.setServerPort(443);
request.setSecure(true);
request.setScheme("https");
request.setServerName("abc.com");
request.setRequestURI("/destination");
request.setQueryString("param1=a&param2=b&param3=1122");
String redirectUrl = "https://abc.com/destination?param1=a&param2=b&param3=1122"; String redirectUrl = "https://abc.com/destination?param1=a&param2=b&param3=1122";
request.setCookies(new Cookie(DEFAULT_COOKIE_NAME, encodeCookie(redirectUrl))); request.setCookies(new Cookie(DEFAULT_COOKIE_NAME, encodeCookie(redirectUrl)));
@ -138,9 +147,14 @@ public class CookieRequestCacheTests {
} }
@Test @Test
public void notMatchingRequestWhenRequestNotContainsSavedRequestCookie() { public void requestWhenDoesNotMatchSavedRequestThenDoesNotClearCookie() {
CookieRequestCache cookieRequestCache = new CookieRequestCache(); CookieRequestCache cookieRequestCache = new CookieRequestCache();
MockHttpServletRequest request = requestToSave(); MockHttpServletRequest request = new MockHttpServletRequest();
request.setServerPort(443);
request.setSecure(true);
request.setScheme("https");
request.setServerName("abc.com");
request.setRequestURI("/destination");
String redirectUrl = "https://abc.com/api"; String redirectUrl = "https://abc.com/api";
request.setCookies(new Cookie(DEFAULT_COOKIE_NAME, encodeCookie(redirectUrl))); request.setCookies(new Cookie(DEFAULT_COOKIE_NAME, encodeCookie(redirectUrl)));
@ -150,7 +164,6 @@ public class CookieRequestCacheTests {
assertThat(matchingRequest).isNull(); assertThat(matchingRequest).isNull();
Cookie expiredCookie = response.getCookie(DEFAULT_COOKIE_NAME); Cookie expiredCookie = response.getCookie(DEFAULT_COOKIE_NAME);
assertThat(expiredCookie).isNull(); assertThat(expiredCookie).isNull();
} }
@Test @Test
@ -164,17 +177,6 @@ public class CookieRequestCacheTests {
assertThat(expiredCookie.getMaxAge()).isZero(); assertThat(expiredCookie.getMaxAge()).isZero();
} }
private MockHttpServletRequest requestToSave() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setServerPort(443);
request.setSecure(true);
request.setScheme("https");
request.setServerName("abc.com");
request.setRequestURI("/destination");
request.setQueryString("param1=a&param2=b&param3=1122");
return request;
}
private static String encodeCookie(String cookieValue) { private static String encodeCookie(String cookieValue) {
return Base64.getEncoder().encodeToString(cookieValue.getBytes()); return Base64.getEncoder().encodeToString(cookieValue.getBytes());
} }