Skip to content

Commit fe348dd

Browse files
committed
fix security filter sort in javadoc
Closes gh-14531
1 parent 7c3a6a5 commit fe348dd

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@
2424
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2525
import org.springframework.security.core.userdetails.UserDetailsService;
2626
import org.springframework.security.oauth2.server.resource.web.authentication.BearerTokenAuthenticationFilter;
27-
import org.springframework.security.openid.OpenIDAuthenticationFilter;
2827
import org.springframework.security.web.DefaultSecurityFilterChain;
2928
import org.springframework.security.web.access.ExceptionTranslationFilter;
3029
import org.springframework.security.web.access.channel.ChannelProcessingFilter;
30+
import org.springframework.security.web.access.intercept.AuthorizationFilter;
3131
import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
3232
import org.springframework.security.web.authentication.AnonymousAuthenticationFilter;
3333
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
@@ -38,14 +38,19 @@
3838
import org.springframework.security.web.authentication.switchuser.SwitchUserFilter;
3939
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
4040
import org.springframework.security.web.authentication.www.DigestAuthenticationFilter;
41+
import org.springframework.security.web.context.SecurityContextHolderFilter;
4142
import org.springframework.security.web.context.SecurityContextPersistenceFilter;
43+
import org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter;
44+
import org.springframework.security.web.csrf.CsrfFilter;
45+
import org.springframework.security.web.header.HeaderWriterFilter;
4246
import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter;
4347
import org.springframework.security.web.savedrequest.RequestCacheAwareFilter;
4448
import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
4549
import org.springframework.security.web.session.ConcurrentSessionFilter;
4650
import org.springframework.security.web.session.DisableEncodeUrlFilter;
4751
import org.springframework.security.web.session.ForceEagerSessionCreationFilter;
4852
import org.springframework.security.web.session.SessionManagementFilter;
53+
import org.springframework.web.filter.CorsFilter;
4954

5055
/**
5156
* @param <H>
@@ -127,17 +132,25 @@ public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>>
127132
* The ordering of the Filters is:
128133
*
129134
* <ul>
130-
* <li>{@link ForceEagerSessionCreationFilter}</li>
131135
* <li>{@link DisableEncodeUrlFilter}</li>
136+
* <li>{@link ForceEagerSessionCreationFilter}</li>
132137
* <li>{@link ChannelProcessingFilter}</li>
138+
* <li>{@link WebAsyncManagerIntegrationFilter}</li>
139+
* <li>{@link SecurityContextHolderFilter}</li>
133140
* <li>{@link SecurityContextPersistenceFilter}</li>
141+
* <li>{@link HeaderWriterFilter}</li>
142+
* <li>{@link CorsFilter}</li>
143+
* <li>{@link CsrfFilter}</li>
134144
* <li>{@link LogoutFilter}</li>
145+
* <li>{@link org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter}</li>
146+
* <li>{@link org.springframework.security.saml2.provider.service.web.Saml2WebSsoAuthenticationRequestFilter}</li>
135147
* <li>{@link X509AuthenticationFilter}</li>
136148
* <li>{@link AbstractPreAuthenticatedProcessingFilter}</li>
137149
* <li><a href="
138150
* {@docRoot}/org/springframework/security/cas/web/CasAuthenticationFilter.html">CasAuthenticationFilter</a></li>
151+
* <li>{@link org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter}</li>
152+
* <li>{@link org.springframework.security.saml2.provider.service.web.authentication.Saml2WebSsoAuthenticationFilter}</li>
139153
* <li>{@link UsernamePasswordAuthenticationFilter}</li>
140-
* <li>{@link OpenIDAuthenticationFilter}</li>
141154
* <li>{@link org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter}</li>
142155
* <li>{@link org.springframework.security.web.authentication.ui.DefaultLogoutPageGeneratingFilter}</li>
143156
* <li>{@link ConcurrentSessionFilter}</li>
@@ -149,9 +162,11 @@ public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>>
149162
* <li>{@link JaasApiIntegrationFilter}</li>
150163
* <li>{@link RememberMeAuthenticationFilter}</li>
151164
* <li>{@link AnonymousAuthenticationFilter}</li>
165+
* <li>{@link org.springframework.security.oauth2.client.web.OAuth2AuthorizationCodeGrantFilter}</li>
152166
* <li>{@link SessionManagementFilter}</li>
153167
* <li>{@link ExceptionTranslationFilter}</li>
154168
* <li>{@link FilterSecurityInterceptor}</li>
169+
* <li>{@link AuthorizationFilter}</li>
155170
* <li>{@link SwitchUserFilter}</li>
156171
* </ul>
157172
* @param filter the {@link Filter} to add

config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterOrderRegistration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ final class FilterOrderRegistration {
9797
order.next());
9898
put(UsernamePasswordAuthenticationFilter.class, order.next());
9999
order.next(); // gh-8105
100-
this.filterToOrder.put("org.springframework.security.openid.OpenIDAuthenticationFilter", order.next());
101100
put(DefaultLoginPageGeneratingFilter.class, order.next());
102101
put(DefaultLogoutPageGeneratingFilter.class, order.next());
103102
put(ConcurrentSessionFilter.class, order.next());

0 commit comments

Comments
 (0)