Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.8.x'

This commit is contained in:
Steve Riesenberg 2022-10-05 13:46:26 -05:00
parent c2ed65c67a 1d706ae13d
commit a7000a053b
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/src/main/kotlin/org/springframework/security/config/annotation/web/CsrfDsl.kt
View File

@ -20,6 +20,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity
import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy
import org.springframework.security.web.csrf.CsrfTokenRepository
import org.springframework.security.web.csrf.CsrfTokenRequestHandler
import org.springframework.security.web.util.matcher.RequestMatcher
import jakarta.servlet.http.HttpServletRequest
@ -39,6 +40,7 @@ class CsrfDsl {
var csrfTokenRepository: CsrfTokenRepository? = null
var requireCsrfProtectionMatcher: RequestMatcher? = null
var sessionAuthenticationStrategy: SessionAuthenticationStrategy? = null
var csrfTokenRequestHandler: CsrfTokenRequestHandler? = null
private var ignoringAntMatchers: Array<out String>? = null
private var ignoringRequestMatchers: Array<out RequestMatcher>? = null
@ -89,6 +91,7 @@ class CsrfDsl {
csrfTokenRepository?.also { csrf.csrfTokenRepository(csrfTokenRepository) }
requireCsrfProtectionMatcher?.also { csrf.requireCsrfProtectionMatcher(requireCsrfProtectionMatcher) }
sessionAuthenticationStrategy?.also { csrf.sessionAuthenticationStrategy(sessionAuthenticationStrategy) }
csrfTokenRequestHandler?.also { csrf.csrfTokenRequestHandler(csrfTokenRequestHandler) }
ignoringAntMatchers?.also { csrf.ignoringAntMatchers(*ignoringAntMatchers!!) }
ignoringRequestMatchers?.also { csrf.ignoringRequestMatchers(*ignoringRequestMatchers!!) }
ignoringRequestMatchersPatterns?.also { csrf.ignoringRequestMatchers(*ignoringRequestMatchersPatterns!!) }

53
config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt
View File

@ -37,6 +37,7 @@ import org.springframework.security.web.SecurityFilterChain
import org.springframework.security.web.authentication.session.NullAuthenticatedSessionStrategy
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy
import org.springframework.security.web.csrf.CsrfTokenRepository
import org.springframework.security.web.csrf.CsrfTokenRequestHandler
import org.springframework.security.web.csrf.DefaultCsrfToken
import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository
import org.springframework.security.web.util.matcher.AntPathRequestMatcher
@ -45,6 +46,8 @@ import org.springframework.test.web.servlet.post
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.servlet.config.annotation.EnableWebMvc
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
/**
* Tests for [CsrfDsl]
@ -322,4 +325,54 @@ class CsrfDslTests {
fun test2() {
}
}
@Test
fun `CSRF when custom csrf token request handler then handler used`() {
this.spring.register(RequestHandlerConfig::class.java).autowire()
mockkObject(RequestHandlerConfig.HANDLER)
every { RequestHandlerConfig.HANDLER.handle(any(), any(), any()) } returns Unit
this.mockMvc.get("/test1")
verify(exactly = 1) { RequestHandlerConfig.HANDLER.handle(any(), any(), any()) }
}
@Test
fun `POST when custom csrf token request handler then handler used`() {
this.spring.register(RequestHandlerConfig::class.java).autowire()
mockkObject(RequestHandlerConfig.HANDLER)
every { RequestHandlerConfig.HANDLER.handle(any(), any(), any()) } answers {
val request: HttpServletRequest = firstArg()
val response: HttpServletResponse = secondArg()
// Required for LazyCsrfTokenRepository
request.setAttribute(HttpServletResponse::class.java.name, response)
}
every { RequestHandlerConfig.HANDLER.resolveCsrfTokenValue(any(), any()) } returns "token"
this.mockMvc.post("/test2")
verify(exactly = 1) { RequestHandlerConfig.HANDLER.handle(any(), any(), any()) }
verify(exactly = 1) { RequestHandlerConfig.HANDLER.resolveCsrfTokenValue(any(), any()) }
}
@Configuration
@EnableWebSecurity
open class RequestHandlerConfig {
companion object {
val HANDLER: CsrfTokenRequestHandler = CsrfTokenRequestHandler { request, response, _ ->
request.setAttribute(HttpServletResponse::class.java.name, response)
}
}
@Bean
open fun filterChain(http: HttpSecurity): SecurityFilterChain {
http {
csrf {
csrfTokenRequestHandler = HANDLER
}
}
return http.build()
}
}
}