Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-24 04:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Kotlin webAuthn {}

Browse Source 
Fixes the default configuration for WebAuthn Kotlin DSL

Closes gh-16338

Signed-off-by: Max Batischev <mblancer@mail.ru>
This commit is contained in:
Max Batischev 2025-01-11 11:56:39 +03:00 committed by Rob Winch
parent d457e0b59d
commit 882766e54f
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/src/main/kotlin/org/springframework/security/config/annotation/web/WebAuthnDsl.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,6 +26,7 @@ import org.springframework.security.config.annotation.web.configurers.WebAuthnCo
* @property the allowed origins * @property the allowed origins
* @since 6.4 * @since 6.4
* @author Rob Winch * @author Rob Winch
* @author Max Batischev
*/ */
@SecurityMarker @SecurityMarker
class WebAuthnDsl { class WebAuthnDsl {
@ -34,10 +35,10 @@ class WebAuthnDsl {
var allowedOrigins: Set<String>? = null var allowedOrigins: Set<String>? = null
internal fun get(): (WebAuthnConfigurer<HttpSecurity>) -> Unit { internal fun get(): (WebAuthnConfigurer<HttpSecurity>) -> Unit {
return { webAuthn -> webAuthn return { webAuthn ->
.rpId(rpId) rpName?.also { webAuthn.rpName(rpName) }
.rpName(rpName) rpId?.also { webAuthn.rpId(rpId) }
.allowedOrigins(allowedOrigins); allowedOrigins?.also { webAuthn.allowedOrigins(allowedOrigins) }
} }
} }
} }

39
config/src/test/kotlin/org/springframework/security/config/annotation/web/WebAuthnDslTests.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,7 @@
package org.springframework.security.config.annotation.web package org.springframework.security.config.annotation.web
import org.hamcrest.Matchers
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -30,7 +31,9 @@ import org.springframework.security.core.userdetails.UserDetailsService
import org.springframework.security.provisioning.InMemoryUserDetailsManager import org.springframework.security.provisioning.InMemoryUserDetailsManager
import org.springframework.security.web.SecurityFilterChain import org.springframework.security.web.SecurityFilterChain
import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.get
import org.springframework.test.web.servlet.post import org.springframework.test.web.servlet.post
import org.springframework.test.web.servlet.result.MockMvcResultMatchers
/** /**
* Tests for [WebAuthnDsl] * Tests for [WebAuthnDsl]
@ -55,6 +58,40 @@ class WebAuthnDslTests {
} }
} }
@Test
fun `webauthn and formLogin configured with default registration page`() {
spring.register(DefaultWebauthnConfig::class.java).autowire()
this.mockMvc.get("/login/webauthn.js")
.andExpect {
MockMvcResultMatchers.status().isOk
header {
string("content-type", "text/javascript;charset=UTF-8")
}
content {
string(Matchers.containsString("async function authenticate("))
}
}
}
@Configuration
@EnableWebSecurity
open class DefaultWebauthnConfig {
@Bean
open fun userDetailsService(): UserDetailsService =
InMemoryUserDetailsManager()
@Bean
open fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
http{
formLogin { }
webAuthn { }
}
return http.build()
}
}
@Configuration @Configuration
@EnableWebSecurity @EnableWebSecurity
open class WebauthnConfig { open class WebauthnConfig {