Skip to content

Commit 16ba01a

Browse files
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-41638
2 parents d496a85 + 9f1c4b7 commit 16ba01a

File tree

1 file changed

+4
-4
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/web

1 file changed

+4
-4
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/web/spring-security.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ You can provide a different `AuthenticationEventPublisher` by adding a bean for
3737
The default security configuration is implemented in `SecurityAutoConfiguration` and `UserDetailsServiceAutoConfiguration`.
3838
`SecurityAutoConfiguration` imports `SpringBootWebSecurityConfiguration` for web security and `UserDetailsServiceAutoConfiguration` configures authentication, which is also relevant in non-web applications.
3939

40-
To switch off the default web application security configuration completely or to combine multiple Spring Security components such as OAuth2 Client and Resource Server, add a bean of type `SecurityFilterChain` (doing so does not disable the `UserDetailsService` configuration or Actuator's security).
41-
To also switch off the `UserDetailsService` configuration, you can add a bean of type `UserDetailsService`, `AuthenticationProvider`, or `AuthenticationManager`.
40+
To completely switch off the default web application security configuration, including Actuator security, or to combine multiple Spring Security components such as OAuth2 Client and Resource Server, add a bean of type `SecurityFilterChain` (doing so does not disable the `UserDetailsService` configuration).
41+
To also switch off the `UserDetailsService` configuration, add a bean of type `UserDetailsService`, `AuthenticationProvider`, or `AuthenticationManager`.
4242

4343
The auto-configuration of a `UserDetailsService` will also back off any of the following Spring Security modules is on the classpath:
4444

@@ -62,8 +62,8 @@ Similar to Spring MVC applications, you can secure your WebFlux applications by
6262
The default security configuration is implemented in `ReactiveSecurityAutoConfiguration` and `UserDetailsServiceAutoConfiguration`.
6363
`ReactiveSecurityAutoConfiguration` imports `WebFluxSecurityConfiguration` for web security and `UserDetailsServiceAutoConfiguration` configures authentication, which is also relevant in non-web applications.
6464

65-
To switch off the default web application security configuration completely, you can add a bean of type `WebFilterChainProxy` (doing so does not disable the `UserDetailsService` configuration or Actuator's security).
66-
To also switch off the `UserDetailsService` configuration, you can add a bean of type `ReactiveUserDetailsService` or `ReactiveAuthenticationManager`.
65+
To completely switch off the default web application security configuration, including Actuator security, add a bean of type `WebFilterChainProxy` (doing so does not disable the `UserDetailsService` configuration).
66+
To also switch off the `UserDetailsService` configuration, add a bean of type `ReactiveUserDetailsService` or `ReactiveAuthenticationManager`.
6767

6868
The auto-configuration will also back off when any of the following Spring Security modules is on the classpath:
6969

0 commit comments

Comments
 (0)