SEC-2507: WebExpressionVoter.supports support subclasses of FilterInv…

…ocation
spring-projects · Mar 10, 2014 · bb56396 · bb56396
1 parent 974105e
commit bb56396
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java
@@ -49,7 +49,7 @@ public boolean supports(ConfigAttribute attribute) {
     }
 
     public boolean supports(Class<?> clazz) {
-        return clazz.isAssignableFrom(FilterInvocation.class);
+        return FilterInvocation.class.isAssignableFrom(clazz);
     }
 
     public void setExpressionHandler(SecurityExpressionHandler<FilterInvocation> expressionHandler) {

diff --git a/...test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/...test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java
@@ -1,5 +1,6 @@
 package org.springframework.security.web.access.expression;
 
+import static org.fest.assertions.Assertions.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -19,6 +20,10 @@
 
 import java.util.ArrayList;
 
+import javax.servlet.FilterChain;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
 /**
  * @author Luke Taylor
  */
@@ -63,4 +68,29 @@ public void grantsAccessIfExpressionIsTrueDeniesIfFalse() {
         assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(user, fi, attributes));
     }
 
+    // SEC-2507
+    @Test
+    public void supportFilterInvocationSubClass() {
+        WebExpressionVoter voter = new WebExpressionVoter();
+        assertThat(voter.supports(FilterInvocationChild.class)).isTrue();
+    }
+
+    private static class FilterInvocationChild extends FilterInvocation {
+        public FilterInvocationChild(ServletRequest request,
+                ServletResponse response, FilterChain chain) {
+            super(request, response, chain);
+        }
+    }
+
+    @Test
+    public void supportFilterInvocation() {
+        WebExpressionVoter voter = new WebExpressionVoter();
+        assertThat(voter.supports(FilterInvocation.class)).isTrue();
+    }
+
+    @Test
+    public void supportsObjectIsFalse() {
+        WebExpressionVoter voter = new WebExpressionVoter();
+        assertThat(voter.supports(Object.class)).isFalse();
+    }
 }