getFilterChains() {
+ return Collections.unmodifiableList(filterChains);
}
/**
@@ -273,7 +289,7 @@ public class FilterChainProxy extends GenericFilterBean {
StringBuilder sb = new StringBuilder();
sb.append("FilterChainProxy[");
sb.append("Filter Chains: ");
- sb.append(filterChainMap);
+ sb.append(filterChains);
sb.append("]");
return sb.toString();
diff --git a/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java b/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java
new file mode 100644
index 0000000000..86e8605954
--- /dev/null
+++ b/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java
@@ -0,0 +1,54 @@
+package org.springframework.security.web;
+
+import org.springframework.security.web.util.RequestMatcher;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Bean which defines a filter chain which is capable of being matched against an {@code HttpServletRequest}.
+ * in order to decide whether it applies to that request.
+ *
+ * Used to configure a {@code FilterChainProxy}.
+ *
+ * @author Luke Taylor
+ *
+ * @since 3.1
+ */
+public final class SecurityFilterChain {
+ private final RequestMatcher requestMatcher;
+ private final List filters;
+
+ public SecurityFilterChain(RequestMatcher requestMatcher, Filter... filters) {
+ this(requestMatcher, Arrays.asList(filters));
+ }
+
+ public SecurityFilterChain(RequestMatcher requestMatcher, List filters) {
+ this.requestMatcher = requestMatcher;
+ this.filters = filters;
+ }
+
+ public RequestMatcher getRequestMatcher() {
+ return requestMatcher;
+ }
+
+ public List getFilters() {
+ return filters;
+ }
+
+ public boolean matches(HttpServletRequest request) {
+ return requestMatcher.matches(request);
+ }
+
+ @Override
+ public String toString() {
+ return "[ " + requestMatcher + ", " + filters + "]";
+ }
+}
diff --git a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
index 4e2e98e3ec..582368a679 100644
--- a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
+++ b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
@@ -35,8 +35,6 @@ public class FilterChainProxyTests {
@Before
public void setup() throws Exception {
- fcp = new FilterChainProxy();
- fcp.setFilterChainValidator(mock(FilterChainProxy.FilterChainValidator.class));
matcher = mock(RequestMatcher.class);
filter = mock(Filter.class);
doAnswer(new Answer() {
@@ -49,9 +47,8 @@ public class FilterChainProxyTests {
return null;
}
}).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
- LinkedHashMap map = new LinkedHashMap();
- map.put(matcher, Arrays.asList(filter));
- fcp.setFilterChainMap(map);
+ fcp = new FilterChainProxy(new SecurityFilterChain(matcher, Arrays.asList(filter)));
+ fcp.setFilterChainValidator(mock(FilterChainProxy.FilterChainValidator.class));
request = new MockHttpServletRequest();
request.setServletPath("/path");
response = new MockHttpServletResponse();
@@ -68,14 +65,23 @@ public class FilterChainProxyTests {
public void securityFilterChainIsNotInvokedIfMatchFails() throws Exception {
when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
fcp.doFilter(request, response, chain);
- assertEquals(1, fcp.getFilterChainMap().size());
- assertSame(filter, fcp.getFilterChainMap().get(matcher).get(0));
+ assertEquals(1, fcp.getFilterChains().size());
+ assertSame(filter, fcp.getFilterChains().get(0).getFilters().get(0));
verifyZeroInteractions(filter);
// The actual filter chain should be invoked though
verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
}
+ @Test
+ @Deprecated
+ public void filterChainMapIsCorrect() throws Exception {
+ fcp.setFilterChainMap(fcp.getFilterChainMap());
+ Map> filterChainMap = fcp.getFilterChainMap();
+ assertEquals(1, filterChainMap.size());
+ assertSame(filter, filterChainMap.get(matcher).get(0));
+ }
+
@Test
public void originalChainIsInvokedAfterSecurityChainIfMatchSucceeds() throws Exception {
when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
@@ -87,9 +93,8 @@ public class FilterChainProxyTests {
@Test
public void originalFilterChainIsInvokedIfMatchingSecurityChainIsEmpty() throws Exception {
- LinkedHashMap map = new LinkedHashMap();
- map.put(matcher, Collections.emptyList());
- fcp.setFilterChainMap(map);
+ List noFilters = Collections.emptyList();
+ fcp = new FilterChainProxy(new SecurityFilterChain(matcher, noFilters));
when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
fcp.doFilter(request, response, chain);
@@ -132,10 +137,7 @@ public class FilterChainProxyTests {
@Test
public void bothWrappersAreResetWithNestedFcps() throws Exception {
HttpFirewall fw = mock(HttpFirewall.class);
- FilterChainProxy firstFcp = new FilterChainProxy();
- LinkedHashMap fcm = new LinkedHashMap();
- fcm.put(matcher, Arrays.asList(fcp));
- firstFcp.setFilterChainMap(fcm);
+ FilterChainProxy firstFcp = new FilterChainProxy(new SecurityFilterChain(matcher, fcp));
firstFcp.setFirewall(fw);
fcp.setFirewall(fw);
FirewalledRequest firstFwr = mock(FirewalledRequest.class, "firstFwr");
@@ -153,4 +155,4 @@ public class FilterChainProxyTests {
verify(firstFwr).reset();
verify(fwr).reset();
}
-}
\ No newline at end of file
+}