diff --git a/docs/modules/ROOT/pages/servlet/architecture.adoc b/docs/modules/ROOT/pages/servlet/architecture.adoc index 904f513fad..280f376446 100644 --- a/docs/modules/ROOT/pages/servlet/architecture.adoc +++ b/docs/modules/ROOT/pages/servlet/architecture.adoc @@ -301,7 +301,7 @@ In this case, remove the call to `httpBasic` since you are constructing `BasicAu ==== In the event that you are unable to reconfigure `HttpSecurity` to not add a certain filter, you can typically disable the Spring Security filter by calling its DSL's `disable` method like so: -include-java::./CustomizingFilterTests[tag=disable,indent=0] +include-code::./CustomizingFilterTests[tag=disable,indent=0] ==== [[servlet-exceptiontranslationfilter]] diff --git a/docs/src/test/java/org/springframework/security/docs/servlet/customizingfilter/CustomizingFilterTests.java b/docs/src/test/java/org/springframework/security/docs/servlet/customizingfilter/CustomizingFilterTests.java index e3e04e07f5..c53800e36b 100644 --- a/docs/src/test/java/org/springframework/security/docs/servlet/customizingfilter/CustomizingFilterTests.java +++ b/docs/src/test/java/org/springframework/security/docs/servlet/customizingfilter/CustomizingFilterTests.java @@ -142,16 +142,16 @@ public class CustomizingFilterTests { @EnableWebSecurity static class SecurityConfigDisable { + // tag::disable[] @Bean SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http - // tag::disable[] .httpBasic((basic) -> basic.disable()); - // end::disable[] // ... return http.build(); } + // end::disable[] } diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/addingcustomfilter/CustomFilterTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/addingcustomfilter/CustomFilterTests.kt index 15ea6564f6..bd7c8241db 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/addingcustomfilter/CustomFilterTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/addingcustomfilter/CustomFilterTests.kt @@ -84,6 +84,7 @@ class CustomFilterTests { open class UserDetailsConfig { @Bean open fun userDetailsService(): UserDetailsService { + @Suppress("DEPRECATION") val user: UserDetails = User.withDefaultPasswordEncoder() .username("user") .password("password") diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/customizingfilter/CustomizingFilterTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/customizingfilter/CustomizingFilterTests.kt index 2735d00884..17c6a3b13f 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/customizingfilter/CustomizingFilterTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/customizingfilter/CustomizingFilterTests.kt @@ -26,7 +26,6 @@ import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import org.springframework.http.HttpHeaders import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.invoke @@ -36,7 +35,6 @@ import org.springframework.security.web.FilterChainProxy import org.springframework.security.web.SecurityFilterChain import org.springframework.security.web.authentication.www.BasicAuthenticationFilter import org.springframework.test.web.servlet.MockMvc -import org.springframework.test.web.servlet.get /** * Tests for customizing security filters. @@ -120,6 +118,23 @@ class CustomizingFilterTests { } + @Configuration @EnableWebSecurity + open class SecurityConfigDisable { + + // tag::disable[] + @Bean + open fun filterChain(http: HttpSecurity): SecurityFilterChain { + http { + httpBasic { + disable() + } + // ... + } + return http.build() + } + // end::disable[] + } + @Configuration @EnableWebSecurity open class SecurityConfigIncorrect {