Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-2297: Add DispatchType.ASYNC as default for AbstractSecurityWebApplicationInitializer

This commit is contained in:
Rob Winch 2013-08-31 11:39:57 -05:00
parent 7203faf34f
commit e8ac11641b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
View File

@ -299,7 +299,7 @@ public abstract class AbstractSecurityWebApplicationInitializer implements WebAp
* @return * @return
*/ */
protected EnumSet<DispatcherType> getSecurityDispatcherTypes() { protected EnumSet<DispatcherType> getSecurityDispatcherTypes() {
return EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR); return EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR, DispatcherType.ASYNC);
} }
/** /**

19
web/src/test/groovy/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializerTests.groovy
View File

@ -33,6 +33,7 @@ import spock.lang.Specification
* *
*/ */
class AbstractSecurityWebApplicationInitializerTests extends Specification { class AbstractSecurityWebApplicationInitializerTests extends Specification {
def DEFAULT_DISPATCH = EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR, DispatcherType.ASYNC)
def defaults() { def defaults() {
setup: setup:
@ -42,7 +43,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
new AbstractSecurityWebApplicationInitializer(){}.onStartup(context) new AbstractSecurityWebApplicationInitializer(){}.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
1 * registration.setAsyncSupported(true) 1 * registration.setAsyncSupported(true)
0 * context.addListener(_) 0 * context.addListener(_)
} }
@ -55,7 +56,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
new AbstractSecurityWebApplicationInitializer(MyRootConfiguration){}.onStartup(context) new AbstractSecurityWebApplicationInitializer(MyRootConfiguration){}.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
1 * registration.setAsyncSupported(true) 1 * registration.setAsyncSupported(true)
1 * context.addListener(_ as ContextLoaderListener) 1 * context.addListener(_ as ContextLoaderListener)
} }
@ -75,7 +76,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
}.onStartup(context) }.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
1 * registration.setAsyncSupported(true) 1 * registration.setAsyncSupported(true)
1 * context.addListener(HttpSessionEventPublisher.class.name) 1 * context.addListener(HttpSessionEventPublisher.class.name)
} }
@ -109,7 +110,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
}.onStartup(context) }.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == "org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher"}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == "org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher"}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
1 * registration.setAsyncSupported(true) 1 * registration.setAsyncSupported(true)
0 * context.addListener(_) 0 * context.addListener(_)
} }
@ -140,7 +141,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
}.onStartup(context) }.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
3 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 3 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
3 * registration.setAsyncSupported(true) 3 * registration.setAsyncSupported(true)
0 * context.addListener(_) 0 * context.addListener(_)
1 * context.addFilter(_, filter1) >> registration 1 * context.addFilter(_, filter1) >> registration
@ -160,7 +161,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
}.onStartup(context) }.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
1 * context.addFilter(_, filter1) >> null 1 * context.addFilter(_, filter1) >> null
IllegalStateException success = thrown() IllegalStateException success = thrown()
success.message == "Duplicate Filter registration for 'filter'. Check to ensure the Filter is only configured once." success.message == "Duplicate Filter registration for 'filter'. Check to ensure the Filter is only configured once."
@ -213,8 +214,8 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
}.onStartup(context) }.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
2 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), true, "/*"); 2 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, true, "/*");
3 * registration.setAsyncSupported(true) 3 * registration.setAsyncSupported(true)
0 * context.addListener(_) 0 * context.addListener(_)
1 * context.addFilter(_, filter1) >> registration 1 * context.addFilter(_, filter1) >> registration
@ -234,7 +235,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
}.onStartup(context) }.onStartup(context)
then: then:
1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration 1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); 1 * registration.addMappingForUrlPatterns(DEFAULT_DISPATCH, false, "/*");
1 * context.addFilter(_, filter1) >> null 1 * context.addFilter(_, filter1) >> null
IllegalStateException success = thrown() IllegalStateException success = thrown()
success.message == "Duplicate Filter registration for 'filter'. Check to ensure the Filter is only configured once." success.message == "Duplicate Filter registration for 'filter'. Check to ensure the Filter is only configured once."