Add addFilterAfter and addFilterBefore to Kotlin DSL
Fixes gh-8316
This commit is contained in:
parent
1de0cf5057
commit
dc6b8ce470
|
@ -669,6 +669,56 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu
|
|||
this.http.addFilterAt(filter, atFilter)
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the [Filter] after the location of the specified [Filter] class.
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* ```
|
||||
* @EnableWebSecurity
|
||||
* class SecurityConfig : WebSecurityConfigurerAdapter() {
|
||||
*
|
||||
* override fun configure(http: HttpSecurity) {
|
||||
* http {
|
||||
* addFilterAfter(CustomFilter(), UsernamePasswordAuthenticationFilter::class.java)
|
||||
* }
|
||||
* }
|
||||
* }
|
||||
* ```
|
||||
*
|
||||
* @param filter the [Filter] to register
|
||||
* @param afterFilter the location of another [Filter] that is already registered
|
||||
* (i.e. known) with Spring Security.
|
||||
*/
|
||||
fun addFilterAfter(filter: Filter, afterFilter: Class<out Filter>) {
|
||||
this.http.addFilterAfter(filter, afterFilter)
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the [Filter] before the location of the specified [Filter] class.
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* ```
|
||||
* @EnableWebSecurity
|
||||
* class SecurityConfig : WebSecurityConfigurerAdapter() {
|
||||
*
|
||||
* override fun configure(http: HttpSecurity) {
|
||||
* http {
|
||||
* addFilterBefore(CustomFilter(), UsernamePasswordAuthenticationFilter::class.java)
|
||||
* }
|
||||
* }
|
||||
* }
|
||||
* ```
|
||||
*
|
||||
* @param filter the [Filter] to register
|
||||
* @param beforeFilter the location of another [Filter] that is already registered
|
||||
* (i.e. known) with Spring Security.
|
||||
*/
|
||||
fun addFilterBefore(filter: Filter, beforeFilter: Class<out Filter>) {
|
||||
this.http.addFilterBefore(filter, beforeFilter)
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply all configurations to the provided [HttpSecurity]
|
||||
*/
|
||||
|
|
|
@ -225,7 +225,7 @@ class HttpSecurityDslTests {
|
|||
val filters: List<Filter> = filterChain.getFilters("/")
|
||||
|
||||
assertThat(filters).hasSize(1)
|
||||
assertThat(filters[0]).isExactlyInstanceOf(CustomFilterConfig.CustomFilter::class.java)
|
||||
assertThat(filters[0]).isExactlyInstanceOf(CustomFilter::class.java)
|
||||
}
|
||||
|
||||
@EnableWebSecurity
|
||||
|
@ -236,7 +236,55 @@ class HttpSecurityDslTests {
|
|||
addFilterAt(CustomFilter(), UsernamePasswordAuthenticationFilter::class.java)
|
||||
}
|
||||
}
|
||||
|
||||
class CustomFilter : UsernamePasswordAuthenticationFilter()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `HTTP security when custom filter configured then custom filter added after specific filter to filter chain`() {
|
||||
this.spring.register(CustomFilterAfterConfig::class.java).autowire()
|
||||
|
||||
val filterChain = spring.context.getBean(FilterChainProxy::class.java)
|
||||
val filters: List<Class<out Filter>> = filterChain.getFilters("/").map { it.javaClass }
|
||||
|
||||
assertThat(filters).containsSubsequence(
|
||||
UsernamePasswordAuthenticationFilter::class.java,
|
||||
CustomFilter::class.java
|
||||
)
|
||||
}
|
||||
|
||||
@EnableWebSecurity
|
||||
@EnableWebMvc
|
||||
open class CustomFilterAfterConfig : WebSecurityConfigurerAdapter() {
|
||||
override fun configure(http: HttpSecurity) {
|
||||
http {
|
||||
addFilterAfter(CustomFilter(), UsernamePasswordAuthenticationFilter::class.java)
|
||||
formLogin {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `HTTP security when custom filter configured then custom filter added before specific filter to filter chain`() {
|
||||
this.spring.register(CustomFilterBeforeConfig::class.java).autowire()
|
||||
|
||||
val filterChain = spring.context.getBean(FilterChainProxy::class.java)
|
||||
val filters: List<Class<out Filter>> = filterChain.getFilters("/").map { it.javaClass }
|
||||
|
||||
assertThat(filters).containsSubsequence(
|
||||
CustomFilter::class.java,
|
||||
UsernamePasswordAuthenticationFilter::class.java
|
||||
)
|
||||
}
|
||||
|
||||
@EnableWebSecurity
|
||||
@EnableWebMvc
|
||||
open class CustomFilterBeforeConfig : WebSecurityConfigurerAdapter() {
|
||||
override fun configure(http: HttpSecurity) {
|
||||
http {
|
||||
addFilterBefore(CustomFilter(), UsernamePasswordAuthenticationFilter::class.java)
|
||||
formLogin {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class CustomFilter : UsernamePasswordAuthenticationFilter()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue