SEC-640: Add namespace support for FilterInvocationDefinitionSource configuration

http://jira.springframework.org/browse/SEC-640

core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java

@@ -38,7 +38,7 @@ import java.util.List;
  */
 public class HttpSecurityBeanDefinitionParserTests {
     private AbstractXmlApplicationContext appContext;
-    private static final String AUTH_PROVIDER_XML =
+    static final String AUTH_PROVIDER_XML =
             "    <authentication-provider>" +
             "        <user-service>" +
             "            <user name='bob' password='bobspassword' authorities='ROLE_A,ROLE_B' />" +

core/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationDefinitionSourceTests.java

@@ -19,6 +19,7 @@ import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.MockFilterChain;
 import org.springframework.security.SecurityConfig;
 import org.springframework.security.util.AntUrlPathMatcher;
+import org.springframework.security.util.InMemoryXmlApplicationContext;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -169,6 +170,38 @@ public class DefaultFilterInvocationDefinitionSourceTests {
         response = map.lookupAttributes(fi.getRequestUrl());
         assertEquals(def, response);
     }
+    
+    @Test
+    public void xmlMapConfigurationIsSuccessful() {
+        InMemoryXmlApplicationContext context = new InMemoryXmlApplicationContext(
+        "<b:bean id='fids' class='org.springframework.security.intercept.web.DefaultFilterInvocationDefinitionSource'>" +
+        "    <b:constructor-arg>" +
+        "        <b:bean class='org.springframework.security.util.AntUrlPathMatcher'/>" +        
+        "    </b:constructor-arg>" +
+        "    <b:constructor-arg>" +
+        "        <b:map>" +
+        "             <b:entry>" +
+        "               <b:key>" +
+        "                   <b:bean class='org.springframework.security.intercept.web.RequestKey'>" +
+        "                     <b:constructor-arg index='0' value='/**'/>" +
+        "                     <b:constructor-arg index='1' value='GET'/>" +
+        "                   </b:bean>" +
+        "               </b:key>" +
+        "               <b:bean class='org.springframework.security.ConfigAttributeDefinition'>" +
+        "                   <b:constructor-arg value='ROLE_A'/>" +
+        "               </b:bean>" +
+        "             </b:entry>" +
+        "        </b:map>" +
+        "    </b:constructor-arg>" +
+        "</b:bean>"
+        );
+        
+        DefaultFilterInvocationDefinitionSource fids = (DefaultFilterInvocationDefinitionSource) context.getBean("fids");
+        ConfigAttributeDefinition cad = fids.lookupAttributes("/anything", "GET");
+        assertNotNull(cad);
+        assertEquals(1, cad.getConfigAttributes().size());
+        context.close();
+    }
 
     private FilterInvocation createFilterInvocation(String path, String method) {
         MockHttpServletRequest request = new MockHttpServletRequest();

core/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java

@@ -39,6 +39,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import java.io.IOException;
 
 import java.util.Collection;
+import java.util.LinkedHashMap;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -220,9 +221,10 @@ public class FilterSecurityInterceptorTests extends TestCase {
     }
 
     public void testNotLoadedFromApplicationContext() throws Exception {
+        LinkedHashMap reqMap = new LinkedHashMap();
+        reqMap.put(new RequestKey("/secure/**", null), new ConfigAttributeDefinition(new String[] {"ROLE_USER"}));
         DefaultFilterInvocationDefinitionSource fids
-                = new DefaultFilterInvocationDefinitionSource(new AntUrlPathMatcher());
-        fids.addSecureUrl("/secure/**", null, new ConfigAttributeDefinition(new String[] {"ROLE_USER"}));
+                = new DefaultFilterInvocationDefinitionSource(new AntUrlPathMatcher());        
 
         FilterSecurityInterceptor filter = new FilterSecurityInterceptor();
         filter.setObjectDefinitionSource(fids);

core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java

@@ -21,6 +21,7 @@ import org.springframework.security.MockFilterConfig;
 import org.springframework.security.context.HttpSessionContextIntegrationFilter;
 import org.springframework.security.intercept.web.MockFilterInvocationDefinitionSource;
 import org.springframework.security.intercept.web.DefaultFilterInvocationDefinitionSource;
+import org.springframework.security.intercept.web.RequestKey;
 import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
 
 import org.springframework.beans.factory.BeanCreationException;
@@ -34,6 +35,7 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
@@ -80,9 +82,10 @@ public class FilterChainProxyTests {
 
         ConfigAttributeDefinition cad = new ConfigAttributeDefinition(new MockConfigAttribute());
 
+        LinkedHashMap map = new LinkedHashMap();
+        map.put(new RequestKey("/**"), cad);
         DefaultFilterInvocationDefinitionSource fids =
-                new DefaultFilterInvocationDefinitionSource(new AntUrlPathMatcher());
-        fids.addSecureUrl("/**", cad);
+                new DefaultFilterInvocationDefinitionSource(new AntUrlPathMatcher(), map);
 
         filterChainProxy.setFilterInvocationDefinitionSource(fids);