From 77a1befcc2da69d18de017a26807da2ab8a2b89b Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 12 Jan 2021 11:33:13 -0600 Subject: [PATCH] Fix Checkstyle for CsrfWebFilter Issue gh-9337 --- .../security/web/server/csrf/CsrfWebFilter.java | 4 ++-- .../security/web/server/csrf/CsrfWebFilterTests.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java b/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java index a42890a106..4d22a51398 100644 --- a/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java @@ -129,8 +129,8 @@ public class CsrfWebFilter implements WebFilter { private Mono validateToken(ServerWebExchange exchange) { return this.csrfTokenRepository.loadToken(exchange) - .switchIfEmpty(Mono - .defer(() -> Mono.error(new CsrfException("An expected CSRF token cannot be found")))) + .switchIfEmpty( + Mono.defer(() -> Mono.error(new CsrfException("An expected CSRF token cannot be found")))) .filterWhen((expected) -> containsValidCsrfToken(exchange, expected)) .switchIfEmpty(Mono.defer(() -> Mono.error(new CsrfException("Invalid CSRF Token")))).then(); } diff --git a/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java index 92fc45a63e..5bae3f58c9 100644 --- a/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java @@ -34,7 +34,6 @@ import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; import org.springframework.web.server.WebSession; @@ -92,7 +91,7 @@ public class CsrfWebFilterTests { StepVerifier.create(result).verifyComplete(); assertThat(this.post.getResponse().getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); StepVerifier.create(this.post.getResponse().getBodyAsString()) - .assertNext(b -> assertThat(b).contains("An expected CSRF token cannot be found")); + .assertNext((body) -> assertThat(body).contains("An expected CSRF token cannot be found")); } @Test