Skip to content

Commit 7fae738

Browse files
franticticktickjzheaux
authored andcommitted
Add support fullyAuthenticated to Kotlin DSL
Closes gh-16162
1 parent bb38fd3 commit 7fae738

File tree

2 files changed

+68
-2
lines changed

2 files changed

+68
-2
lines changed

config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt

+7
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,13 @@ class AuthorizeHttpRequestsDsl : AbstractRequestMatcherDsl {
275275
val authenticated: AuthorizationManager<RequestAuthorizationContext> =
276276
AuthenticatedAuthorizationManager.authenticated()
277277

278+
/**
279+
* Specify that URLs are allowed by users who have authenticated and were not "remembered".
280+
* @since 6.5
281+
*/
282+
val fullyAuthenticated: AuthorizationManager<RequestAuthorizationContext> =
283+
AuthenticatedAuthorizationManager.fullyAuthenticated()
284+
278285
internal fun get(): (AuthorizeHttpRequestsConfigurer<HttpSecurity>.AuthorizationManagerRequestMatcherRegistry) -> Unit {
279286
return { requests ->
280287
authorizationRules.forEach { rule ->

config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt

+61-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import org.springframework.context.annotation.Configuration
2727
import org.springframework.http.HttpMethod
2828
import org.springframework.security.access.hierarchicalroles.RoleHierarchy
2929
import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl
30+
import org.springframework.security.authentication.RememberMeAuthenticationToken
31+
import org.springframework.security.authentication.TestAuthentication
3032
import org.springframework.security.authorization.AuthorizationDecision
3133
import org.springframework.security.authorization.AuthorizationManager
3234
import org.springframework.security.config.annotation.web.builders.HttpSecurity
@@ -35,11 +37,11 @@ import org.springframework.security.config.core.GrantedAuthorityDefaults
3537
import org.springframework.security.config.test.SpringTestContext
3638
import org.springframework.security.config.test.SpringTestContextExtension
3739
import org.springframework.security.core.Authentication
40+
import org.springframework.security.core.authority.AuthorityUtils
3841
import org.springframework.security.core.userdetails.User
3942
import org.springframework.security.core.userdetails.UserDetailsService
4043
import org.springframework.security.provisioning.InMemoryUserDetailsManager
41-
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf
42-
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic
44+
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*
4345
import org.springframework.security.web.SecurityFilterChain
4446
import org.springframework.security.web.access.intercept.RequestAuthorizationContext
4547
import org.springframework.security.web.util.matcher.RegexRequestMatcher
@@ -961,4 +963,61 @@ class AuthorizeHttpRequestsDslTests {
961963
}
962964

963965
}
966+
967+
@Test
968+
fun `request when fully authenticated configured then responds ok`() {
969+
this.spring.register(FullyAuthenticatedConfig::class.java).autowire()
970+
971+
this.mockMvc.get("/path") {
972+
with(user("user").roles("USER"))
973+
}.andExpect {
974+
status {
975+
isOk()
976+
}
977+
}
978+
}
979+
980+
@Test
981+
fun `request when fully authenticated configured and remember-me token then responds unauthorized`() {
982+
this.spring.register(FullyAuthenticatedConfig::class.java).autowire()
983+
val rememberMe = RememberMeAuthenticationToken("key", "user",
984+
AuthorityUtils.createAuthorityList("ROLE_USER"))
985+
986+
this.mockMvc.get("/path") {
987+
with(user("user").roles("USER"))
988+
with(authentication(rememberMe))
989+
}.andExpect {
990+
status {
991+
isUnauthorized()
992+
}
993+
}
994+
}
995+
996+
@Configuration
997+
@EnableWebSecurity
998+
@EnableWebMvc
999+
open class FullyAuthenticatedConfig {
1000+
@Bean
1001+
open fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
1002+
http {
1003+
authorizeHttpRequests {
1004+
authorize("/path", fullyAuthenticated)
1005+
}
1006+
httpBasic { }
1007+
rememberMe { }
1008+
}
1009+
return http.build()
1010+
}
1011+
1012+
@Bean
1013+
open fun userDetailsService(): UserDetailsService = InMemoryUserDetailsManager(TestAuthentication.user())
1014+
1015+
@RestController
1016+
internal class PathController {
1017+
@GetMapping("/path")
1018+
fun path(): String {
1019+
return "ok"
1020+
}
1021+
}
1022+
}
9641023
}

0 commit comments

Comments
 (0)