diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index ed84d98016..e441b92504 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -103,6 +103,8 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.handler.HandlerMappingIntrospector; +import static org.springframework.security.config.Customizer.withDefaults; + /** * A {@link HttpSecurity} is similar to Spring Security's XML <http> element in the * namespace configuration. It allows configuring web based security for specific http @@ -219,8 +221,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @Configuration @@ -266,8 +268,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder @@ -331,7 +333,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderExample Configurations * * Accepting the default provided by {@link EnableWebSecurity} or only invoking - * {@link #headers()} without invoking additional methods on it, is the equivalent of: + * {@link #headers(Customizer)} without invoking additional methods on it, is the + * equivalent of: * *
 	 * @Configuration
@@ -372,9 +375,9 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder
 	 * @Configuration
@@ -397,7 +400,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder
 	 * @Configuration
@@ -615,9 +618,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderExample Configuration
 	 *
@@ -657,7 +661,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderdocumentation
 	 * for more details.
-	 * @see #requiresChannel()
+	 * @see #requiresChannel(withDefaults())
 	 */
 	@Deprecated(since = "6.1", forRemoval = true)
 	public PortMapperConfigurer portMapper() throws Exception {
@@ -669,9 +673,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderExample Configuration
 	 *
@@ -714,7 +719,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> portMapperCustomizer)
 			throws Exception {
@@ -1776,7 +1781,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderExample Custom Configuration
@@ -1827,8 +1832,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderExample Custom Configuration
 	 *
@@ -2499,7 +2504,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderrequired and must be
 	 * registered with the {@link ApplicationContext} or configured via
-	 * {@link #saml2Login()}.
+ * {@link #saml2Login(withDefaults())}.
*
* * The default configuration provides an auto-generated logout endpoint at diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java index 84706ebae4..49ac91307d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java @@ -46,8 +46,9 @@ import org.springframework.security.web.SecurityFilterChain; * * @Bean * public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - * http.authorizeHttpRequests().requestMatchers("/public/**").permitAll().anyRequest() - * .hasRole("USER").and() + * http.authorizeHttpRequests((authorize) -> authorize + * .requestMatchers("/public/**").permitAll() + * .anyRequest().hasRole("USER")) * // Possibly more configuration ... * .formLogin() // enable form based log in * // set permitAll for all URLs associated with Form Login diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java index a6af1e782e..d3f83c2b1a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java @@ -21,6 +21,7 @@ import java.util.UUID; import org.springframework.security.authentication.AnonymousAuthenticationProvider; import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.SecurityConfigurer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -57,7 +58,7 @@ public final class AnonymousConfigurer> /** * Creates a new instance - * @see HttpSecurity#anonymous() + * @see HttpSecurity#anonymous(Customizer) */ public AnonymousConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java index b5e7f93e87..11e54195c9 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java @@ -43,6 +43,8 @@ import org.springframework.security.web.access.channel.SecureChannelProcessor; import org.springframework.security.web.access.intercept.DefaultFilterInvocationSecurityMetadataSource; import org.springframework.security.web.util.matcher.RequestMatcher; +import static org.springframework.security.config.Customizer.withDefaults; + /** * Adds channel security (i.e. requires HTTPS or HTTP) to an application. In order for * {@link ChannelSecurityConfigurer} to be useful, at least one {@link RequestMatcher} @@ -96,7 +98,7 @@ public final class ChannelSecurityConfigurer> /** * Creates a new instance - * @see HttpSecurity#requiresChannel() + * @see HttpSecurity#requiresChannel(Customizer) */ public ChannelSecurityConfigurer(ApplicationContext context) { this.REGISTRY = new ChannelRequestMatcherRegistry(context); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurer.java index 58129ff1d6..c35c2eb5e2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurer.java @@ -18,6 +18,7 @@ package org.springframework.security.config.annotation.web.configurers; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.util.Assert; @@ -57,7 +58,7 @@ public class CorsConfigurer> extends AbstractHt /** * Creates a new instance * - * @see HttpSecurity#cors() + * @see HttpSecurity#cors(Customizer) */ public CorsConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java index 6188a7f056..c16f150d48 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java @@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.springframework.context.ApplicationContext; import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -56,6 +57,8 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import static org.springframework.security.config.Customizer.withDefaults; + /** * Adds * CSRF @@ -103,7 +106,7 @@ public final class CsrfConfigurer> /** * Creates a new instance - * @see HttpSecurity#csrf() + * @see HttpSecurity#csrf(Customizer) */ public CsrfConfigurer(ApplicationContext context) { this.context = context; @@ -163,9 +166,8 @@ public final class CsrfConfigurer> * *
 	 * http
-	 *     .csrf()
-	 *         .ignoringRequestMatchers((request) -> "XMLHttpRequest".equals(request.getHeader("X-Requested-With")))
-	 *         .and()
+	 *     .csrf((csrf) -> csrf
+	 *         .ignoringRequestMatchers((request) -> "XMLHttpRequest".equals(request.getHeader("X-Requested-With"))))
 	 *     ...
 	 * 
* @@ -191,9 +193,8 @@ public final class CsrfConfigurer> * *
 	 * http
-	 *     .csrf()
-	 *         .ignoringRequestMatchers("/sockjs/**")
-	 *         .and()
+	 *     .csrf((csrf) -> csrf
+	 *         .ignoringRequestMatchers("/sockjs/**"))
 	 *     ...
 	 * 
* diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java index 7640de9afb..57ecaedb87 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java @@ -18,6 +18,7 @@ package org.springframework.security.config.annotation.web.configurers; import java.util.LinkedHashMap; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.AuthenticationEntryPoint; @@ -76,7 +77,7 @@ public final class ExceptionHandlingConfigurer> /** * Creates a new instance - * @see HttpSecurity#exceptionHandling() + * @see HttpSecurity#exceptionHandling(Customizer) */ public ExceptionHandlingConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java index c3a9bd1377..f622c4936e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java @@ -29,6 +29,7 @@ import org.springframework.security.access.SecurityConfig; import org.springframework.security.access.expression.SecurityExpressionHandler; import org.springframework.security.access.hierarchicalroles.RoleHierarchy; import org.springframework.security.authentication.AuthenticationTrustResolver; +import org.springframework.security.config.Customizer; import org.springframework.security.config.ObjectPostProcessor; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -41,6 +42,8 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import static org.springframework.security.config.Customizer.withDefaults; + /** * Adds URL based authorization based upon SpEL expressions to an application. At least * one {@link org.springframework.web.bind.annotation.RequestMapping} needs to be mapped @@ -77,7 +80,7 @@ import org.springframework.util.StringUtils; * @author Yanming Zhou * @author Ngoc Nhan * @since 3.2 - * @see org.springframework.security.config.annotation.web.builders.HttpSecurity#authorizeRequests() + * @see org.springframework.security.config.annotation.web.builders.HttpSecurity#authorizeRequests(Customizer) * @deprecated Use {@link AuthorizeHttpRequestsConfigurer} instead */ @Deprecated @@ -104,7 +107,7 @@ public final class ExpressionUrlAuthorizationConfigurer> extends /** * Creates a new instance - * @see HttpSecurity#formLogin() + * @see HttpSecurity#formLogin(Customizer) */ public FormLoginConfigurer() { super(new UsernamePasswordAuthenticationFilter(), null); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java index 569dc8d124..e99cec8f54 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java @@ -48,6 +48,8 @@ import org.springframework.security.web.header.writers.frameoptions.XFrameOption import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; +import static org.springframework.security.config.Customizer.withDefaults; + /** *

* Adds the Security HTTP headers to the response. Security HTTP headers is activated by @@ -111,7 +113,7 @@ public class HeadersConfigurer> /** * Creates a new instance * - * @see HttpSecurity#headers() + * @see HttpSecurity#headers(Customizer) */ public HeadersConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java index 5180267226..39b53b9a20 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java @@ -26,6 +26,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.security.authentication.AuthenticationDetailsSource; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.AuthenticationEntryPoint; @@ -98,7 +99,7 @@ public final class HttpBasicConfigurer> /** * Creates a new instance - * @see HttpSecurity#httpBasic() + * @see HttpSecurity#httpBasic(Customizer) */ public HttpBasicConfigurer() { realmName(DEFAULT_REALM); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java index 7c505924eb..be5359caa6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java @@ -22,6 +22,7 @@ import java.util.Set; import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.core.authority.mapping.SimpleMappableAttributesRetriever; @@ -77,7 +78,7 @@ public final class JeeConfigurer> extends Abstr /** * Creates a new instance - * @see HttpSecurity#jee() + * @see HttpSecurity#jee(Customizer) */ public JeeConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java index 3c89ccbaf4..fa9a8298a2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java @@ -23,6 +23,7 @@ import java.util.List; import jakarta.servlet.http.HttpSession; import org.springframework.http.HttpMethod; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.SecurityConfigurer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.RequestMatcherFactory; @@ -92,7 +93,7 @@ public final class LogoutConfigurer> /** * Creates a new instance - * @see HttpSecurity#logout() + * @see HttpSecurity#logout(Customizer) */ public LogoutConfigurer() { } @@ -150,7 +151,7 @@ public final class LogoutConfigurer> * @param logoutUrl the URL that will invoke logout. * @return the {@link LogoutConfigurer} for further customization * @see #logoutRequestMatcher(RequestMatcher) - * @see HttpSecurity#csrf() + * @see HttpSecurity#csrf(Customizer) */ public LogoutConfigurer logoutUrl(String logoutUrl) { this.logoutRequestMatcher = null; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java index 621d21a349..9a939f2b8c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java @@ -16,6 +16,7 @@ package org.springframework.security.config.annotation.web.configurers; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -70,7 +71,7 @@ public final class SecurityContextConfigurer> /** * Creates a new instance - * @see HttpSecurity#securityContext() + * @see HttpSecurity#securityContext(Customizer) */ public SecurityContextConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java index a1b64f1ea0..758e290048 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java @@ -23,6 +23,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.context.ApplicationContext; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationTrustResolver; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.core.GrantedAuthorityDefaults; @@ -66,7 +67,7 @@ public final class ServletApiConfigurer> /** * Creates a new instance - * @see HttpSecurity#servletApi() + * @see HttpSecurity#servletApi(Customizer) */ public ServletApiConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java index fa601b9449..0ac0480e03 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java @@ -66,6 +66,8 @@ import org.springframework.security.web.session.SimpleRedirectSessionInformation import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; +import static org.springframework.security.config.Customizer.withDefaults; + /** * Allows configuring session management. * @@ -152,7 +154,7 @@ public final class SessionManagementConfigurer> /** * Creates a new instance - * @see HttpSecurity#sessionManagement() + * @see HttpSecurity#sessionManagement(Customizer) */ public SessionManagementConfigurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java index d6241a0fbe..8760598f46 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.context.ApplicationContext; import org.springframework.security.authentication.AuthenticationDetailsSource; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.core.Authentication; @@ -90,7 +91,7 @@ public final class X509Configurer> /** * Creates a new instance * - * @see HttpSecurity#x509() + * @see HttpSecurity#x509(Customizer) */ public X509Configurer() { } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java index 355e49670b..d270f55731 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java @@ -104,6 +104,8 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; +import static org.springframework.security.config.Customizer.withDefaults; + /** * An {@link AbstractHttpConfigurer} for OAuth 2.0 Login, which leverages the OAuth 2.0 * Authorization Code Grant Flow. @@ -155,7 +157,7 @@ import org.springframework.util.ReflectionUtils; * @author Kazuki Shimizu * @author Ngoc Nhan * @since 5.0 - * @see HttpSecurity#oauth2Login() + * @see HttpSecurity#oauth2Login(Customizer) * @see OAuth2AuthorizationRequestRedirectFilter * @see OAuth2LoginAuthenticationFilter * @see ClientRegistrationRepository diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 1f7efc1829..e6d92ce33e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -27,6 +27,7 @@ import org.opensaml.core.Version; import org.springframework.context.ApplicationContext; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.RequestMatcherFactory; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -111,7 +112,7 @@ import org.springframework.util.StringUtils; * * * @since 5.2 - * @see HttpSecurity#saml2Login() + * @see HttpSecurity#saml2Login(Customizer) * @see Saml2WebSsoAuthenticationFilter * @see Saml2WebSsoAuthenticationRequestFilter * @see RelyingPartyRegistrationRepository diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java index fc9950d964..22358ea3a2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java @@ -71,6 +71,8 @@ import org.springframework.security.web.util.matcher.AndRequestMatcher; import org.springframework.security.web.util.matcher.ParameterRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; +import static org.springframework.security.config.Customizer.withDefaults; + /** * Adds SAML 2.0 logout support. * @@ -135,7 +137,7 @@ public final class Saml2LogoutConfigurer> /** * Creates a new instance - * @see HttpSecurity#logout() + * @see HttpSecurity#logout(Customizer) */ public Saml2LogoutConfigurer(ApplicationContext context) { this.context = context; @@ -158,7 +160,7 @@ public final class Saml2LogoutConfigurer> * @param logoutUrl the URL that will invoke logout * @return the {@link LogoutConfigurer} for further customizations * @see LogoutConfigurer#logoutUrl(String) - * @see HttpSecurity#csrf() + * @see HttpSecurity#csrf(Customizer) */ public Saml2LogoutConfigurer logoutUrl(String logoutUrl) { this.logoutUrl = logoutUrl;