diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java index 9155a9aa10..4eef55adbf 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java @@ -27,6 +27,7 @@ import org.springframework.security.access.vote.AuthenticatedVoter; import org.springframework.security.access.vote.RoleVoter; import org.springframework.security.config.annotation.ObjectPostProcessor; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.access.intercept.DefaultFilterInvocationSecurityMetadataSource; import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource; import org.springframework.security.web.util.matcher.RequestMatcher; @@ -48,10 +49,10 @@ import org.springframework.util.Assert; *
  * protected void configure(HttpSecurity http) throws Exception {
  *     http
- *         .apply(new UrlAuthorizationConfigurer()).getRegistry()
- *             .antMatchers("/users**","/sessions/**").hasRole("USER")
- *             .antMatchers("/signup").hasRole("ANONYMOUS")
- *             .anyRequest().hasRole("USER")
+ *          .apply(new UrlAuthorizationConfigurer()).getRegistry()
+ *              .antMatchers("/users**","/sessions/**").hasRole("USER")
+ *              .antMatchers("/signup").hasRole("ANONYMOUS")
+ *              .anyRequest().hasRole("USER");
  * }
  * 
* diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java new file mode 100644 index 0000000000..015610ad92 --- /dev/null +++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java @@ -0,0 +1,34 @@ +/* + * Copyright 2002-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.security.config.annotation.web.builders; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.configuration.BaseWebConfig; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.UrlAuthorizationConfigurer; + +@Configuration +@EnableWebSecurity +public class DisableUseExpressionsConfig extends BaseWebConfig { + protected void configure(HttpSecurity http) throws Exception { + // This config is also on UrlAuthorizationConfigurer javadoc + http + .apply(new UrlAuthorizationConfigurer()).getRegistry() + .antMatchers("/users**","/sessions/**").hasRole("USER") + .antMatchers("/signup").hasRole("ANONYMOUS") + .anyRequest().hasRole("USER"); + } +} diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.groovy b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.groovy index 1669ee90fc..a20ad1a92c 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.groovy +++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.groovy @@ -501,16 +501,4 @@ public class NamespaceHttpTests extends BaseSpringSpec { findFilter(FilterSecurityInterceptor).securityMetadataSource.class == DefaultFilterInvocationSecurityMetadataSource findFilter(FilterSecurityInterceptor).accessDecisionManager.decisionVoters.collect { it.class } == [RoleVoter, AuthenticatedVoter] } - - @Configuration - @EnableWebSecurity - static class DisableUseExpressionsConfig extends BaseWebConfig { - protected void configure(HttpSecurity http) throws Exception { - http - .apply(new UrlAuthorizationConfigurer()).getRegistry() - .antMatchers("/users**","/sessions/**").hasRole("USER") - .antMatchers("/signup").hasRole("ANONYMOUS") - .anyRequest().hasRole("USER") - } - } }