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

Mono<CsrfToken> saveToken->Mono<Void>

Browse Source 
Issue: gh-4856
This commit is contained in:
Rob Winch 2017-11-20 16:25:33 -06:00
parent d55db837e1
commit 70be0f3619
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ public class CsrfWebFilter implements WebFilter {
private Mono<CsrfToken> generateToken(ServerWebExchange exchange) {
return this.csrfTokenRepository.generateToken(exchange)
.flatMap(token -> this.csrfTokenRepository.saveToken(exchange, token));
.delayUntil(token -> this.csrfTokenRepository.saveToken(exchange, token));
}
private static class DefaultRequireCsrfProtectionMatcher implements ServerWebExchangeMatcher {

2
web/src/main/java/org/springframework/security/web/server/csrf/ServerCsrfTokenRepository.java
View File

@ -46,7 +46,7 @@ public interface ServerCsrfTokenRepository {
* @param exchange the {@link ServerWebExchange} to use
* @param token the {@link CsrfToken} to save or null to delete
*/
Mono<CsrfToken> saveToken(ServerWebExchange exchange, CsrfToken token);
Mono<Void> saveToken(ServerWebExchange exchange, CsrfToken token);
/**
* Loads the expected {@link CsrfToken} from the {@link ServerWebExchange}

7
web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java
View File

@ -52,15 +52,14 @@ public class WebSessionServerCsrfTokenRepository
}
@Override
public Mono<CsrfToken> saveToken(ServerWebExchange exchange, CsrfToken token) {
public Mono<Void> saveToken(ServerWebExchange exchange, CsrfToken token) {
return exchange.getSession()
.doOnNext(session -> putToken(session.getAttributes(), token))
.flatMap(session -> session.changeSessionId())
.then(Mono.justOrEmpty(token));
.flatMap(session -> session.changeSessionId());
}
private void putToken(Map<String, Object> attributes, CsrfToken token) {
if(token == null) {
if (token == null) {
attributes.remove(this.sessionAttributeName);
} else {
attributes.put(this.sessionAttributeName, token);

2
web/src/test/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepositoryTests.java
View File

@ -78,7 +78,7 @@ public class WebSessionServerCsrfTokenRepositoryTests {
public void saveTokenWhenNullThenDeletes() {
CsrfToken token = this.repository.generateToken(this.exchange).block();
Mono<CsrfToken> result = this.repository.saveToken(this.exchange, null);
Mono<Void> result = this.repository.saveToken(this.exchange, null);
StepVerifier.create(result)
.verifyComplete();