refactoring of pattern matching for targets and channels

org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/IncludeExcludePattern.java

@@ -0,0 +1,31 @@
+package org.springframework.integration.security.config;
+
+/**
+ * 
+ * @author Jonas Partner
+ *
+ */
+public class IncludeExcludePattern {
+	
+	private final boolean isIncludePattern;
+	
+	private final String pattern;
+
+	public IncludeExcludePattern(boolean isIncludePattern, String pattern) {
+		this.isIncludePattern = isIncludePattern;
+		this.pattern = pattern;
+	}
+
+	public IncludeExcludePattern(String pattern) {
+		this(true,pattern);
+	}
+	
+	public boolean isIncludePattern() {
+		return isIncludePattern;
+	}
+
+	public String getPattern() {
+		return pattern;
+	}
+	
+}

org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/JdkRegExpOrderedIncludeExcludeList.java

@@ -0,0 +1,56 @@
+package org.springframework.integration.security.config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class JdkRegExpOrderedIncludeExcludeList implements OrderedIncludeExcludeList {
+	
+	private final boolean includeByDefault;
+	
+	private final List<PatternHolder> patternHolders;
+	
+	public JdkRegExpOrderedIncludeExcludeList(List<IncludeExcludePattern> patterns){
+		this(true, patterns);
+	}
+	
+	public JdkRegExpOrderedIncludeExcludeList(boolean includeByDefault, List<IncludeExcludePattern> patterns) {
+		super();
+		this.includeByDefault = includeByDefault;
+		List<PatternHolder> patternHolders = new ArrayList<PatternHolder>();
+		for(int i = 0 ; i <patterns.size(); i++){
+			patternHolders.add(new PatternHolder(Pattern.compile(patterns.get(i).getPattern()), patterns.get(i)) );
+		}
+		this.patternHolders = Collections.unmodifiableList(patternHolders);
+	}
+
+	public boolean isIncluded(String name) {
+		for(int i = 0; i < patternHolders.size(); i++){
+			if(patternHolders.get(i).compiledPattern.matcher(name).matches()){
+				return (patternHolders.get(i).includeExcludePattern.isIncludePattern());
+			}
+		}
+		return includeByDefault;
+	}
+	
+	private static class PatternHolder{
+		
+		private final Pattern compiledPattern;
+		
+		private final IncludeExcludePattern includeExcludePattern;
+
+		public PatternHolder(Pattern compiledPattern, IncludeExcludePattern includeExcludePattern) {
+			super();
+			this.compiledPattern = compiledPattern;
+			this.includeExcludePattern = includeExcludePattern;
+		}
+
+		
+	}
+	
+	
+
+	
+	
+}

org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/OrderedIncludeExcludeList.java

@@ -0,0 +1,13 @@
+package org.springframework.integration.security.config;
+
+
+/**
+ * 
+ * @author Jonas Partner
+ *
+ */
+public interface OrderedIncludeExcludeList {
+
+	public boolean isIncluded(String name);
+
+}

org.springframework.integration.security/src/main/java/org/springframework/integration/security/target/TargetSecuringAdvisor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.security;
+package org.springframework.integration.security.target;
 
 import org.aopalliance.aop.Advice;
 import org.springframework.aop.ClassFilter;

org.springframework.integration.security/src/main/java/org/springframework/integration/security/target/TargetSecuringInterceptor.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.security;
+package org.springframework.integration.security.target;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.integration.message.Message;
+import org.springframework.integration.security.SecurityContextUtils;
 import org.springframework.security.AccessDecisionManager;
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.context.SecurityContext;

org.springframework.integration.security/src/main/java/org/springframework/integration/security/target/TargetSendMethodArgMatcher.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.security;
+package org.springframework.integration.security.target;
 
 import java.lang.reflect.Method;
 

org.springframework.integration.security/src/main/java/org/springframework/integration/security/target/config/SecuredTargetsParser.java

@@ -0,0 +1,30 @@
+package org.springframework.integration.security.target.config;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
+public class SecuredTargetsParser extends AbstractSingleBeanDefinitionParser {
+
+	public SecuredTargetsParser() {
+		super();
+	}
+
+	@Override
+	protected boolean shouldGenerateId() {
+		return true;
+	}
+
+	@Override
+	protected boolean shouldGenerateIdAsFallback() {
+		return true;
+	}
+
+	@Override
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+		
+	}
+
+
+}

org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/JdkRegExpOrderedIncludeExcludeListTests.java

@@ -0,0 +1,61 @@
+package org.springframework.integration.security.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+
+/**
+ * 
+ * @author Jonas Partner
+ *
+ */
+public class JdkRegExpOrderedIncludeExcludeListTests {
+
+	@Test
+	public void testSimpleInclusionIncludeByDefaultFalse() {
+		List<IncludeExcludePattern> patterns = createIncludeExcludeList(new boolean[] { true }, new String[] { ".*" });
+		JdkRegExpOrderedIncludeExcludeList matcher = new JdkRegExpOrderedIncludeExcludeList(false, patterns);
+		assertTrue("Did not match expected name", matcher.isIncluded("anyoldthing"));
+
+	}
+
+	@Test
+	public void testNoPatternsIncludeByDefaultTrue() {
+		List<IncludeExcludePattern> patterns = createIncludeExcludeList(new boolean[] {}, new String[] {});
+		JdkRegExpOrderedIncludeExcludeList matcher = new JdkRegExpOrderedIncludeExcludeList(true, patterns);
+		assertTrue("Did not match expected name", matcher.isIncluded("anyoldthing"));
+	}
+
+	@Test
+	public void testNoPatternsIncludeByDefaultFalse() {
+		List<IncludeExcludePattern> patterns = createIncludeExcludeList(new boolean[] {}, new String[] {});
+		JdkRegExpOrderedIncludeExcludeList matcher = new JdkRegExpOrderedIncludeExcludeList(false, patterns);
+		assertFalse("Unexpected match when match by default false and no patterns", matcher.isIncluded("anyoldthing"));
+	}
+
+	
+	@Test
+	public void testExcludeThenIncludeWithIncludeByDefaultFalse() {
+		List<IncludeExcludePattern> patterns = createIncludeExcludeList(new boolean[] {false, true}, new String[] {"admin.*",".*"});
+		JdkRegExpOrderedIncludeExcludeList matcher = new JdkRegExpOrderedIncludeExcludeList(false, patterns);
+		assertFalse("Unexpected match when match by default false and should have been excluded", matcher.isIncluded("adminChannel"));
+	}
+	
+	
+	List<IncludeExcludePattern> createIncludeExcludeList(boolean[] includeExclude, String[] patterns) {
+		assertEquals("flag and patterns arrays must be same length", includeExclude.length, patterns.length);
+
+		List<IncludeExcludePattern> includeExcludePatterns = new ArrayList<IncludeExcludePattern>(patterns.length);
+		for (int i = 0; i < includeExclude.length; i++) {
+			includeExcludePatterns.add(new IncludeExcludePattern(includeExclude[i], patterns[i]));
+		}
+		return includeExcludePatterns;
+	}
+
+}

org.springframework.integration.security/src/test/java/org/springframework/integration/security/target/TargetSecuringAdvisorTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.security;
+package org.springframework.integration.security.target;
 
 import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
@@ -21,6 +21,7 @@ import org.springframework.integration.message.BlockingTarget;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.message.Target;
+import org.springframework.integration.security.target.TargetSecuringAdvisor;
 import org.springframework.security.AccessDecisionManager;
 import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;

org.springframework.integration.security/src/test/java/org/springframework/integration/security/target/TargetSecuringInterceptorTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.security;
+package org.springframework.integration.security.target;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,8 +25,8 @@ import org.springframework.integration.message.Message;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.message.Target;
 import org.springframework.integration.security.SecurityContextUtils;
-import org.springframework.integration.security.TargetSecuringInterceptor;
 import org.springframework.integration.security.config.SecurityTestUtil;
+import org.springframework.integration.security.target.TargetSecuringInterceptor;
 import org.springframework.security.AccessDecisionManager;
 import org.springframework.security.AccessDeniedException;
 import org.springframework.security.ConfigAttributeDefinition;