Remove Redundant ConcurrentSessionFilter Refs
Fixes gh-8105
This commit is contained in:
parent
7411f25474
commit
bfd36d9a54
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2013 the original author or authors.
|
* Copyright 2002-2020 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.
|
||||||
|
@ -136,14 +136,12 @@ public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>> extends
|
||||||
*
|
*
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li>{@link ChannelProcessingFilter}</li>
|
* <li>{@link ChannelProcessingFilter}</li>
|
||||||
* <li>{@link ConcurrentSessionFilter}</li>
|
|
||||||
* <li>{@link SecurityContextPersistenceFilter}</li>
|
* <li>{@link SecurityContextPersistenceFilter}</li>
|
||||||
* <li>{@link LogoutFilter}</li>
|
* <li>{@link LogoutFilter}</li>
|
||||||
* <li>{@link X509AuthenticationFilter}</li>
|
* <li>{@link X509AuthenticationFilter}</li>
|
||||||
* <li>{@link AbstractPreAuthenticatedProcessingFilter}</li>
|
* <li>{@link AbstractPreAuthenticatedProcessingFilter}</li>
|
||||||
* <li><a href="{@docRoot}/org/springframework/security/cas/web/CasAuthenticationFilter.html">CasAuthenticationFilter</a></li>
|
* <li><a href="{@docRoot}/org/springframework/security/cas/web/CasAuthenticationFilter.html">CasAuthenticationFilter</a></li>
|
||||||
* <li>{@link UsernamePasswordAuthenticationFilter}</li>
|
* <li>{@link UsernamePasswordAuthenticationFilter}</li>
|
||||||
* <li>{@link ConcurrentSessionFilter}</li>
|
|
||||||
* <li>{@link OpenIDAuthenticationFilter}</li>
|
* <li>{@link OpenIDAuthenticationFilter}</li>
|
||||||
* <li>{@link org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter}</li>
|
* <li>{@link org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter}</li>
|
||||||
* <li>{@link org.springframework.security.web.authentication.ui.DefaultLogoutPageGeneratingFilter}</li>
|
* <li>{@link org.springframework.security.web.authentication.ui.DefaultLogoutPageGeneratingFilter}</li>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2013 the original author or authors.
|
* Copyright 2002-2020 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.
|
||||||
|
@ -63,7 +63,7 @@ final class FilterComparator implements Comparator<Filter>, Serializable {
|
||||||
FilterComparator() {
|
FilterComparator() {
|
||||||
Step order = new Step(INITIAL_ORDER, ORDER_STEP);
|
Step order = new Step(INITIAL_ORDER, ORDER_STEP);
|
||||||
put(ChannelProcessingFilter.class, order.next());
|
put(ChannelProcessingFilter.class, order.next());
|
||||||
put(ConcurrentSessionFilter.class, order.next());
|
order.next(); // gh-8105
|
||||||
put(WebAsyncManagerIntegrationFilter.class, order.next());
|
put(WebAsyncManagerIntegrationFilter.class, order.next());
|
||||||
put(SecurityContextPersistenceFilter.class, order.next());
|
put(SecurityContextPersistenceFilter.class, order.next());
|
||||||
put(HeaderWriterFilter.class, order.next());
|
put(HeaderWriterFilter.class, order.next());
|
||||||
|
@ -87,7 +87,7 @@ final class FilterComparator implements Comparator<Filter>, Serializable {
|
||||||
"org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter",
|
"org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter",
|
||||||
order.next());
|
order.next());
|
||||||
put(UsernamePasswordAuthenticationFilter.class, order.next());
|
put(UsernamePasswordAuthenticationFilter.class, order.next());
|
||||||
put(ConcurrentSessionFilter.class, order.next());
|
order.next(); // gh-8105
|
||||||
filterToOrder.put(
|
filterToOrder.put(
|
||||||
"org.springframework.security.openid.OpenIDAuthenticationFilter", order.next());
|
"org.springframework.security.openid.OpenIDAuthenticationFilter", order.next());
|
||||||
put(DefaultLoginPageGeneratingFilter.class, order.next());
|
put(DefaultLoginPageGeneratingFilter.class, order.next());
|
||||||
|
|
|
@ -9,7 +9,6 @@ However, there are times that it is beneficial to know the ordering
|
||||||
Below is a comprehensive list of Spring Security Filter ordering:
|
Below is a comprehensive list of Spring Security Filter ordering:
|
||||||
|
|
||||||
* ChannelProcessingFilter
|
* ChannelProcessingFilter
|
||||||
* ConcurrentSessionFilter
|
|
||||||
* WebAsyncManagerIntegrationFilter
|
* WebAsyncManagerIntegrationFilter
|
||||||
* SecurityContextPersistenceFilter
|
* SecurityContextPersistenceFilter
|
||||||
* HeaderWriterFilter
|
* HeaderWriterFilter
|
||||||
|
@ -24,10 +23,10 @@ Below is a comprehensive list of Spring Security Filter ordering:
|
||||||
* OAuth2LoginAuthenticationFilter
|
* OAuth2LoginAuthenticationFilter
|
||||||
* Saml2WebSsoAuthenticationFilter
|
* Saml2WebSsoAuthenticationFilter
|
||||||
* <<servlet-authentication-usernamepasswordauthenticationfilter,`UsernamePasswordAuthenticationFilter`>>
|
* <<servlet-authentication-usernamepasswordauthenticationfilter,`UsernamePasswordAuthenticationFilter`>>
|
||||||
* ConcurrentSessionFilter
|
|
||||||
* OpenIDAuthenticationFilter
|
* OpenIDAuthenticationFilter
|
||||||
* DefaultLoginPageGeneratingFilter
|
* DefaultLoginPageGeneratingFilter
|
||||||
* DefaultLogoutPageGeneratingFilter
|
* DefaultLogoutPageGeneratingFilter
|
||||||
|
* ConcurrentSessionFilter
|
||||||
* <<servlet-authentication-digest,`DigestAuthenticationFilter`>>
|
* <<servlet-authentication-digest,`DigestAuthenticationFilter`>>
|
||||||
* BearerTokenAuthenticationFilter
|
* BearerTokenAuthenticationFilter
|
||||||
* <<servlet-authentication-basic,`BasicAuthenticationFilter`>>
|
* <<servlet-authentication-basic,`BasicAuthenticationFilter`>>
|
||||||
|
|
Loading…
Reference in New Issue