Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serverCsrfTokenRepository->csrfTokenRepository 

Issue: gh-4822
This commit is contained in:
Rob Winch 2017-11-14 15:19:53 -06:00
parent 3bfda6cff7
commit 2cbdb4ba02
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -399,9 +399,9 @@ public class ServerHttpSecurity {
return this;
}
public CsrfSpec serverCsrfTokenRepository(
ServerCsrfTokenRepository serverCsrfTokenRepository) {
this.filter.setServerCsrfTokenRepository(serverCsrfTokenRepository);
public CsrfSpec csrfTokenRepository(
ServerCsrfTokenRepository csrfTokenRepository) {
this.filter.setCsrfTokenRepository(csrfTokenRepository);
return this;
}

18
web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java
View File

@ -55,7 +55,7 @@ public class CsrfWebFilter implements WebFilter {
private ServerWebExchangeMatcher requireCsrfProtectionMatcher = new DefaultRequireCsrfProtectionMatcher();
private ServerCsrfTokenRepository serverCsrfTokenRepository = new WebSessionServerCsrfTokenRepository();
private ServerCsrfTokenRepository csrfTokenRepository = new WebSessionServerCsrfTokenRepository();
private ServerAccessDeniedHandler accessDeniedHandler = new HttpStatusServerAccessDeniedHandler(HttpStatus.FORBIDDEN);
@ -65,10 +65,10 @@ public class CsrfWebFilter implements WebFilter {
this.accessDeniedHandler = accessDeniedHandler;
}
public void setServerCsrfTokenRepository(
ServerCsrfTokenRepository serverCsrfTokenRepository) {
Assert.notNull(serverCsrfTokenRepository, "serverCsrfTokenRepository cannot be null");
this.serverCsrfTokenRepository = serverCsrfTokenRepository;
public void setCsrfTokenRepository(
ServerCsrfTokenRepository csrfTokenRepository) {
Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
this.csrfTokenRepository = csrfTokenRepository;
}
public void setRequireCsrfProtectionMatcher(
@ -90,7 +90,7 @@ public class CsrfWebFilter implements WebFilter {
}
private Mono<Void> validateToken(ServerWebExchange exchange) {
return this.serverCsrfTokenRepository.loadToken(exchange)
return this.csrfTokenRepository.loadToken(exchange)
.switchIfEmpty(Mono.error(new CsrfException("CSRF Token has been associated to this client")))
.filterWhen(expected -> containsValidCsrfToken(exchange, expected))
.switchIfEmpty(Mono.error(new CsrfException("Invalid CSRF Token")))
@ -113,13 +113,13 @@ public class CsrfWebFilter implements WebFilter {
}
private Mono<CsrfToken> csrfToken(ServerWebExchange exchange) {
return this.serverCsrfTokenRepository.loadToken(exchange)
return this.csrfTokenRepository.loadToken(exchange)
.switchIfEmpty(generateToken(exchange));
}
private Mono<CsrfToken> generateToken(ServerWebExchange exchange) {
return this.serverCsrfTokenRepository.generateToken(exchange)
.flatMap(token -> this.serverCsrfTokenRepository.saveToken(exchange, token));
return this.csrfTokenRepository.generateToken(exchange)
.flatMap(token -> this.csrfTokenRepository.saveToken(exchange, token));
}
private static class DefaultRequireCsrfProtectionMatcher implements ServerWebExchangeMatcher {

10
web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java
View File

@ -86,7 +86,7 @@ public class CsrfWebFilterTests {
@Test
public void filterWhenPostAndEstablishedCsrfTokenAndRequestMissingTokenThenCsrfException() {
this.csrfFilter.setServerCsrfTokenRepository(this.repository);
this.csrfFilter.setCsrfTokenRepository(this.repository);
when(this.repository.loadToken(any()))
.thenReturn(Mono.just(this.token));
when(this.repository.generateToken(any()))
@ -103,7 +103,7 @@ public class CsrfWebFilterTests {
@Test
public void filterWhenPostAndEstablishedCsrfTokenAndRequestParamInvalidTokenThenCsrfException() {
this.csrfFilter.setServerCsrfTokenRepository(this.repository);
this.csrfFilter.setCsrfTokenRepository(this.repository);
when(this.repository.loadToken(any()))
.thenReturn(Mono.just(this.token));
when(this.repository.generateToken(any()))
@ -124,7 +124,7 @@ public class CsrfWebFilterTests {
PublisherProbe<Void> chainResult = PublisherProbe.empty();
when(this.chain.filter(any())).thenReturn(chainResult.mono());
this.csrfFilter.setServerCsrfTokenRepository(this.repository);
this.csrfFilter.setCsrfTokenRepository(this.repository);
when(this.repository.loadToken(any()))
.thenReturn(Mono.just(this.token));
when(this.repository.generateToken(any()))
@ -143,7 +143,7 @@ public class CsrfWebFilterTests {
@Test
public void filterWhenPostAndEstablishedCsrfTokenAndHeaderInvalidTokenThenCsrfException() {
this.csrfFilter.setServerCsrfTokenRepository(this.repository);
this.csrfFilter.setCsrfTokenRepository(this.repository);
when(this.repository.loadToken(any()))
.thenReturn(Mono.just(this.token));
when(this.repository.generateToken(any()))
@ -164,7 +164,7 @@ public class CsrfWebFilterTests {
PublisherProbe<Void> chainResult = PublisherProbe.empty();
when(this.chain.filter(any())).thenReturn(chainResult.mono());
this.csrfFilter.setServerCsrfTokenRepository(this.repository);
this.csrfFilter.setCsrfTokenRepository(this.repository);
when(this.repository.loadToken(any()))
.thenReturn(Mono.just(this.token));
when(this.repository.generateToken(any()))