mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-06-01 09:42:13 +00:00
Fix tests in CsrfConfigurerTests
Closes gh-12241
This commit is contained in:
parent
5da78f44f2
commit
dd9f954ace
@ -521,8 +521,7 @@ public class CsrfConfigurerTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void loginWhenFormLoginAndCookieCsrfTokenRepositorySetAndExistingTokenThenRemovesAndGeneratesNewToken()
|
public void loginWhenFormLoginAndCookieCsrfTokenRepositorySetAndExistingTokenThenRemoves() throws Exception {
|
||||||
throws Exception {
|
|
||||||
CsrfToken csrfToken = new DefaultCsrfToken("X-XSRF-TOKEN", "_csrf", "token");
|
CsrfToken csrfToken = new DefaultCsrfToken("X-XSRF-TOKEN", "_csrf", "token");
|
||||||
Cookie existingCookie = new Cookie("XSRF-TOKEN", csrfToken.getToken());
|
Cookie existingCookie = new Cookie("XSRF-TOKEN", csrfToken.getToken());
|
||||||
CookieCsrfTokenRepository csrfTokenRepository = CookieCsrfTokenRepository.withHttpOnlyFalse();
|
CookieCsrfTokenRepository csrfTokenRepository = CookieCsrfTokenRepository.withHttpOnlyFalse();
|
||||||
@ -541,13 +540,12 @@ public class CsrfConfigurerTests {
|
|||||||
MvcResult mvcResult = this.mvc.perform(loginRequest).andExpect(redirectedUrl("/")).andReturn();
|
MvcResult mvcResult = this.mvc.perform(loginRequest).andExpect(redirectedUrl("/")).andReturn();
|
||||||
List<Cookie> cookies = Arrays.asList(mvcResult.getResponse().getCookies());
|
List<Cookie> cookies = Arrays.asList(mvcResult.getResponse().getCookies());
|
||||||
cookies.removeIf((cookie) -> !cookie.getName().equalsIgnoreCase(existingCookie.getName()));
|
cookies.removeIf((cookie) -> !cookie.getName().equalsIgnoreCase(existingCookie.getName()));
|
||||||
assertThat(cookies).hasSize(2);
|
assertThat(cookies).hasSize(1);
|
||||||
assertThat(cookies.get(0).getValue()).isEmpty();
|
assertThat(cookies.get(0).getValue()).isEmpty();
|
||||||
assertThat(cookies.get(1).getValue()).isNotEmpty();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void postWhenHttpBasicAndCookieCsrfTokenRepositorySetAndExistingTokenThenRemovesAndGeneratesNewToken()
|
public void postWhenHttpBasicAndCookieCsrfTokenRepositorySetAndExistingTokenThenDoesNotGenerateNewToken()
|
||||||
throws Exception {
|
throws Exception {
|
||||||
CsrfToken csrfToken = new DefaultCsrfToken("X-XSRF-TOKEN", "_csrf", "token");
|
CsrfToken csrfToken = new DefaultCsrfToken("X-XSRF-TOKEN", "_csrf", "token");
|
||||||
Cookie existingCookie = new Cookie("XSRF-TOKEN", csrfToken.getToken());
|
Cookie existingCookie = new Cookie("XSRF-TOKEN", csrfToken.getToken());
|
||||||
@ -569,13 +567,11 @@ public class CsrfConfigurerTests {
|
|||||||
// @formatter:on
|
// @formatter:on
|
||||||
List<Cookie> cookies = Arrays.asList(mvcResult.getResponse().getCookies());
|
List<Cookie> cookies = Arrays.asList(mvcResult.getResponse().getCookies());
|
||||||
cookies.removeIf((cookie) -> !cookie.getName().equalsIgnoreCase(existingCookie.getName()));
|
cookies.removeIf((cookie) -> !cookie.getName().equalsIgnoreCase(existingCookie.getName()));
|
||||||
assertThat(cookies).hasSize(2);
|
assertThat(cookies).isEmpty();
|
||||||
assertThat(cookies.get(0).getValue()).isEmpty();
|
|
||||||
assertThat(cookies.get(1).getValue()).isNotEmpty();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getWhenHttpBasicAndCookieCsrfTokenRepositorySetAndNoExistingCookieThenGeneratesNewToken()
|
public void getWhenHttpBasicAndCookieCsrfTokenRepositorySetAndNoExistingCookieThenDoesNotGenerateNewToken()
|
||||||
throws Exception {
|
throws Exception {
|
||||||
CsrfToken csrfToken = new DefaultCsrfToken("X-XSRF-TOKEN", "_csrf", "token");
|
CsrfToken csrfToken = new DefaultCsrfToken("X-XSRF-TOKEN", "_csrf", "token");
|
||||||
Cookie expectedCookie = new Cookie("XSRF-TOKEN", csrfToken.getToken());
|
Cookie expectedCookie = new Cookie("XSRF-TOKEN", csrfToken.getToken());
|
||||||
@ -596,8 +592,7 @@ public class CsrfConfigurerTests {
|
|||||||
// @formatter:on
|
// @formatter:on
|
||||||
List<Cookie> cookies = Arrays.asList(mvcResult.getResponse().getCookies());
|
List<Cookie> cookies = Arrays.asList(mvcResult.getResponse().getCookies());
|
||||||
cookies.removeIf((cookie) -> !cookie.getName().equalsIgnoreCase(expectedCookie.getName()));
|
cookies.removeIf((cookie) -> !cookie.getName().equalsIgnoreCase(expectedCookie.getName()));
|
||||||
assertThat(cookies).hasSize(1);
|
assertThat(cookies).isEmpty();
|
||||||
assertThat(cookies.get(0).getValue()).isNotEmpty();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
|
Loading…
x
Reference in New Issue
Block a user