Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 06:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-747: impossible to specify "observeOncePerRequest" property in the namespace based configuration.

Browse Source 
http://jira.springframework.org/browse/SEC-747. Added once-per-request attribute to http element.
This commit is contained in:
Luke Taylor 2008-04-07 15:30:27 +00:00
parent 6612d0f729
commit 236e310ea7
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java
View File

@ -95,6 +95,8 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
static final String ATT_ENTRY_POINT_REF = "entry-point-ref"; static final String ATT_ENTRY_POINT_REF = "entry-point-ref";
static final String ATT_ONCE_PER_REQUEST = "once-per-request";
public BeanDefinition parse(Element element, ParserContext parserContext) { public BeanDefinition parse(Element element, ParserContext parserContext) {
BeanDefinitionRegistry registry = parserContext.getRegistry(); BeanDefinitionRegistry registry = parserContext.getRegistry();
RootBeanDefinition filterChainProxy = new RootBeanDefinition(FilterChainProxy.class); RootBeanDefinition filterChainProxy = new RootBeanDefinition(FilterChainProxy.class);
@ -157,6 +159,10 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
filterSecurityInterceptorBuilder.addPropertyValue("authenticationManager", filterSecurityInterceptorBuilder.addPropertyValue("authenticationManager",
ConfigUtils.registerProviderManagerIfNecessary(parserContext)); ConfigUtils.registerProviderManagerIfNecessary(parserContext));
if ("true".equals(element.getAttribute(ATT_ONCE_PER_REQUEST))) {
filterSecurityInterceptorBuilder.addPropertyValue("observeOncePerRequest", Boolean.TRUE);
}
// SEC-501 - should paths stored in request maps be converted to lower case // SEC-501 - should paths stored in request maps be converted to lower case
// true if Ant path and using lower case // true if Ant path and using lower case
boolean convertPathsToLowerCase = (matcher instanceof AntUrlPathMatcher) && matcher.requiresLowerCaseUrl(); boolean convertPathsToLowerCase = (matcher instanceof AntUrlPathMatcher) && matcher.requiresLowerCaseUrl();

3
core/src/main/resources/org/springframework/security/config/spring-security-2.0.rnc
View File

@ -214,6 +214,9 @@ http.attlist &=
http.attlist &= http.attlist &=
## Allows a customized AuthenticationEntryPoint to be used. ## Allows a customized AuthenticationEntryPoint to be used.
attribute entry-point-ref {xsd:string}? attribute entry-point-ref {xsd:string}?
http.attlist &=
## Corresponds to the observeOncePerRequest property of FilterSecurityInterceptor. Defaults to "false"
attribute once-per-request {"true" | "false"}?
intercept-url = intercept-url =

12
core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
View File

@ -710,6 +710,18 @@
used.</xs:documentation> used.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="once-per-request">
<xs:annotation>
<xs:documentation>Corresponds to the observeOncePerRequest property of
FilterSecurityInterceptor. Defaults to "false"</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="true"/>
<xs:enumeration value="false"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="intercept-url.attlist"> <xs:attributeGroup name="intercept-url.attlist">
<xs:attribute name="pattern" use="required" type="xs:string"> <xs:attribute name="pattern" use="required" type="xs:string">

12
core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
View File

@ -189,6 +189,17 @@ public class HttpSecurityBeanDefinitionParserTests {
setContext("<http><http-basic /></http>" + AUTH_PROVIDER_XML); setContext("<http><http-basic /></http>" + AUTH_PROVIDER_XML);
} }
@Test
public void oncePerRequestAttributeIsSupported() {
setContext("<http once-per-request='true'><http-basic /></http>" + AUTH_PROVIDER_XML);
FilterChainProxy filterChainProxy = getFilterChainProxy();
List filters = filterChainProxy.getFilters("/someurl");
FilterSecurityInterceptor fsi = (FilterSecurityInterceptor) filters.get(filters.size() - 1);
assertTrue(fsi.isObserveOncePerRequest());
}
@Test @Test
public void interceptUrlWithRequiresChannelAddsChannelFilterToStack() { public void interceptUrlWithRequiresChannelAddsChannelFilterToStack() {
setContext( setContext(
@ -196,7 +207,6 @@ public class HttpSecurityBeanDefinitionParserTests {
" <intercept-url pattern='/**' requires-channel='https' />" + " <intercept-url pattern='/**' requires-channel='https' />" +
" </http>" + AUTH_PROVIDER_XML); " </http>" + AUTH_PROVIDER_XML);
FilterChainProxy filterChainProxy = getFilterChainProxy(); FilterChainProxy filterChainProxy = getFilterChainProxy();
List filters = filterChainProxy.getFilters("/someurl"); List filters = filterChainProxy.getFilters("/someurl");
assertEquals("Expected 12 filters in chain", 12, filters.size()); assertEquals("Expected 12 filters in chain", 12, filters.size());