Skip to content

Commit 72c2533

Browse files
Fix authenticationFailureHandler customization tests
Issue gh-12132
1 parent c7b9b33 commit 72c2533

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt

+13-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ import org.springframework.security.config.annotation.web.reactive.EnableWebFlux
3232
import org.springframework.security.config.test.SpringTestContext
3333
import org.springframework.security.config.test.SpringTestContextExtension
3434
import org.springframework.security.core.Authentication
35+
import org.springframework.security.core.AuthenticationException
3536
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService
3637
import org.springframework.security.core.userdetails.User
3738
import org.springframework.security.web.server.SecurityWebFilterChain
3839
import org.springframework.security.web.server.ServerAuthenticationEntryPoint
40+
import org.springframework.security.web.server.WebFilterExchange
3941
import org.springframework.security.web.server.authentication.HttpStatusServerEntryPoint
4042
import org.springframework.security.web.server.authentication.ServerAuthenticationFailureHandler
4143
import org.springframework.security.web.server.context.ServerSecurityContextRepository
@@ -250,7 +252,7 @@ class ServerHttpBasicDslTests {
250252
open class CustomAuthenticationFailureHandlerConfig {
251253

252254
companion object {
253-
val FAILURE_HANDLER: ServerAuthenticationFailureHandler = ServerAuthenticationFailureHandler { _, _ -> Mono.empty() }
255+
val FAILURE_HANDLER: ServerAuthenticationFailureHandler = MockServerAuthenticationFailureHandler()
254256
}
255257

256258
@Bean
@@ -266,6 +268,16 @@ class ServerHttpBasicDslTests {
266268
}
267269
}
268270

271+
open class MockServerAuthenticationFailureHandler: ServerAuthenticationFailureHandler {
272+
override fun onAuthenticationFailure(
273+
webFilterExchange: WebFilterExchange?,
274+
exception: AuthenticationException?
275+
): Mono<Void> {
276+
return Mono.empty()
277+
}
278+
279+
}
280+
269281
@Configuration
270282
open class UserDetailsConfig {
271283
@Bean

config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2ResourceServerDslTests.kt

+13-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ import org.springframework.security.authentication.ReactiveAuthenticationManager
3030
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
3131
import org.springframework.security.config.test.SpringTestContext
3232
import org.springframework.security.config.test.SpringTestContextExtension
33+
import org.springframework.security.core.AuthenticationException
3334
import org.springframework.security.oauth2.server.resource.authentication.JwtIssuerReactiveAuthenticationManagerResolver
3435
import org.springframework.security.oauth2.server.resource.web.server.authentication.ServerBearerTokenAuthenticationConverter
3536
import org.springframework.security.web.server.SecurityWebFilterChain
37+
import org.springframework.security.web.server.WebFilterExchange
3638
import org.springframework.security.web.server.authentication.HttpStatusServerEntryPoint
3739
import org.springframework.security.web.server.authentication.ServerAuthenticationFailureHandler
3840
import org.springframework.security.web.server.authorization.HttpStatusServerAccessDeniedHandler
@@ -152,7 +154,7 @@ class ServerOAuth2ResourceServerDslTests {
152154
open class AuthenticationFailureHandlerConfig {
153155

154156
companion object {
155-
val FAILURE_HANDLER: ServerAuthenticationFailureHandler = ServerAuthenticationFailureHandler { _, _ -> Mono.empty() }
157+
val FAILURE_HANDLER: ServerAuthenticationFailureHandler = MockServerAuthenticationFailureHandler()
156158
}
157159

158160
@Bean
@@ -171,6 +173,16 @@ class ServerOAuth2ResourceServerDslTests {
171173
}
172174
}
173175

176+
open class MockServerAuthenticationFailureHandler: ServerAuthenticationFailureHandler {
177+
override fun onAuthenticationFailure(
178+
webFilterExchange: WebFilterExchange?,
179+
exception: AuthenticationException?
180+
): Mono<Void> {
181+
return Mono.empty()
182+
}
183+
184+
}
185+
174186
@Test
175187
fun `request when custom bearer token converter configured then custom converter used`() {
176188
this.spring.register(BearerTokenConverterConfig::class.java).autowire()

0 commit comments

Comments
 (0)