From 2774948b92fae9bf8faee3f7fe1a97ea5e82f665 Mon Sep 17 00:00:00 2001 From: Rob Winch <362503+rwinch@users.noreply.github.com> Date: Fri, 12 Sep 2025 16:31:53 -0500 Subject: [PATCH] Fix X509 WebFlux Configuration Checks The changes for gh-17382 broke the checkstyle and tests. This fixes them both. Issue gh-17382 --- .../security/config/web/server/ServerHttpSecurity.java | 2 +- .../security/config/web/server/ServerHttpSecurityTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java index 699e360c34..54b078cd79 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java @@ -3256,7 +3256,7 @@ public class ServerHttpSecurity { X509PrincipalExtractor principalExtractor = getPrincipalExtractor(); ServerAuthenticationConverter converter = getServerAuthenticationConverter(principalExtractor); AuthenticationWebFilter filter = new AuthenticationWebFilter(authenticationManager); - filter.setServerAuthenticationConverter(serverAuthenticationConverter); + filter.setServerAuthenticationConverter(converter); http.addFilterAt(filter, SecurityWebFiltersOrder.AUTHENTICATION); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java index 010b05b3b8..dcc0f7f722 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java @@ -504,7 +504,7 @@ public class ServerHttpSecurityTests { this.http.x509((x509) -> x509.serverAuthenticationConverter(mockConverter)); SecurityWebFilterChain securityWebFilterChain = this.http.build(); WebFilter x509WebFilter = securityWebFilterChain.getWebFilters() - .filter(filter -> matchesX509Converter(filter, mockConverter)) + .filter((filter) -> matchesX509Converter(filter, mockConverter)) .blockFirst(); assertThat(x509WebFilter).isNotNull(); }