Browse Source

Fix X509 WebFlux Configuration Checks

The changes for gh-17382 broke the checkstyle and tests. This fixes
them both.

Issue gh-17382
pull/17884/head
Rob Winch 3 months ago
parent
commit
2774948b92
  1. 2
      config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
  2. 2
      config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java

2
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java

@ -3256,7 +3256,7 @@ public class ServerHttpSecurity { @@ -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);
}

2
config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java

@ -504,7 +504,7 @@ public class ServerHttpSecurityTests { @@ -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();
}

Loading…
Cancel
Save