diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSecuringAdvisor.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSecuringAdvisor.java index 6d5bba1713..a1dfc92e53 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSecuringAdvisor.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSecuringAdvisor.java @@ -31,6 +31,7 @@ import org.springframework.security.AccessDecisionManager; import org.springframework.security.ConfigAttributeDefinition; import org.springframework.util.StringUtils; +@SuppressWarnings("serial") public class TargetSecuringAdvisor extends AbstractPointcutAdvisor implements Pointcut { private ClassFilter classFilter; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSendMethodArgMatcher.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSendMethodArgMatcher.java index 57b743ffc0..c778607d55 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSendMethodArgMatcher.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/TargetSendMethodArgMatcher.java @@ -28,12 +28,14 @@ import org.springframework.integration.message.Message; public class TargetSendMethodArgMatcher extends StaticMethodMatcher{ + @SuppressWarnings("unchecked") public boolean matches(Method method, Class targetClass) { return argsTypesMatch(method.getParameterTypes()); } + @SuppressWarnings("unchecked") protected boolean argsTypesMatch(Class[] args){ if(args.length > 2){ return false; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/SecurityEnforcingChannelInterceptor.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/SecurityEnforcingChannelInterceptor.java index e58993386c..6bfa622c7f 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/SecurityEnforcingChannelInterceptor.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/SecurityEnforcingChannelInterceptor.java @@ -16,7 +16,6 @@ package org.springframework.integration.security.channel; -import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/ChannelInterceptorRegisteringBeanPostProcessorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/ChannelInterceptorRegisteringBeanPostProcessorTests.java index fe3e6174de..22b26fe001 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/ChannelInterceptorRegisteringBeanPostProcessorTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/ChannelInterceptorRegisteringBeanPostProcessorTests.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import org.easymock.EasyMock; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.integration.channel.AbstractMessageChannel; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/TargetSecuringAdvisorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/TargetSecuringAdvisorTests.java index b61fe37b9a..c519ccb142 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/TargetSecuringAdvisorTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/TargetSecuringAdvisorTests.java @@ -43,11 +43,6 @@ public class TargetSecuringAdvisorTests { } - @Test - public void testTargetSendIntercpeted() { - TestTarget target = new TestTarget(); - } - @Test(expected = AccessDeniedException.class) public void testTargetSendAdvised() { TargetSecuringAdvisor advisor = new TargetSecuringAdvisor(new AlwaysDenyAccessDecisionManager(), "ROLE_ADMIN"); @@ -92,6 +87,7 @@ public class TargetSecuringAdvisorTests { return true; } + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { return true; } diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java index e73a7663bb..df476f3542 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java @@ -16,21 +16,20 @@ package org.springframework.integration.security.config; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.message.Message; import org.springframework.integration.message.selector.MessageSelector; import org.springframework.integration.security.channel.SecurityEnforcingChannelInterceptor; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.ConfigAttributeDefinition; import org.springframework.security.SecurityConfig; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -39,71 +38,84 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; * @author Jonas Partner */ @ContextConfiguration -public class SecuredChannelsParserTests extends AbstractJUnit4SpringContextTests{ +public class SecuredChannelsParserTests extends AbstractJUnit4SpringContextTests { + + TestMessageChannel messageChannel; - TestMessageChannel messageChannel ; - @Before - public void setUp(){ + public void setUp() { messageChannel = new TestMessageChannel(); } - + @Test - public void testAdminRequiredForSend(){ - applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, "adminRequiredForSend"); + public void testAdminRequiredForSend() { + applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, + "adminRequiredForSend"); assertEquals("Wrong count of interceptors ", 1, messageChannel.interceptors.size()); - SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor)messageChannel.interceptors.get(0); - assertTrue("ROLE_ADMIN not found as send attribute", interceptor.getSendSecurityAttributes().contains(new SecurityConfig("ROLE_ADMIN"))); + SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor) messageChannel.interceptors + .get(0); + assertTrue("ROLE_ADMIN not found as send attribute", interceptor.getSendSecurityAttributes().contains( + new SecurityConfig("ROLE_ADMIN"))); assertNull("Receive security attribute were not null", interceptor.getReceiveSecurityAttributes()); } - + @Test - public void testAdminOrUserRequiredForSend(){ - applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, "adminOrUserRequiredForSend"); + public void testAdminOrUserRequiredForSend() { + applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, + "adminOrUserRequiredForSend"); assertEquals("Wrong count of interceptors ", 1, messageChannel.interceptors.size()); - SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor)messageChannel.interceptors.get(0); - assertTrue("ROLE_ADMIN not found as send attribute", interceptor.getSendSecurityAttributes().contains(new SecurityConfig("ROLE_ADMIN"))); - assertTrue("ROLE_USER not found as send attribute", interceptor.getSendSecurityAttributes().contains(new SecurityConfig("ROLE_USER"))); + SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor) messageChannel.interceptors + .get(0); + assertTrue("ROLE_ADMIN not found as send attribute", interceptor.getSendSecurityAttributes().contains( + new SecurityConfig("ROLE_ADMIN"))); + assertTrue("ROLE_USER not found as send attribute", interceptor.getSendSecurityAttributes().contains( + new SecurityConfig("ROLE_USER"))); assertNull("Receive security attribute were not null", interceptor.getReceiveSecurityAttributes()); } - + @Test - public void testAdminRequiredForReceive(){ - applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, "adminRequiredForReceive"); + public void testAdminRequiredForReceive() { + applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, + "adminRequiredForReceive"); assertEquals("Wrong count of interceptors ", 1, messageChannel.interceptors.size()); - SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor)messageChannel.interceptors.get(0); - assertTrue("ROLE_ADMIN not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains(new SecurityConfig("ROLE_ADMIN"))); + SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor) messageChannel.interceptors + .get(0); + assertTrue("ROLE_ADMIN not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains( + new SecurityConfig("ROLE_ADMIN"))); assertNull("Send security attribute were not null", interceptor.getSendSecurityAttributes()); } - + @Test - public void testAdminOrUserRequiredForReceive(){ - applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, "adminOrUserRequiredForReceive"); + public void testAdminOrUserRequiredForReceive() { + applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, + "adminOrUserRequiredForReceive"); assertEquals("Wrong count of interceptors ", 1, messageChannel.interceptors.size()); - SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor)messageChannel.interceptors.get(0); - assertTrue("ROLE_ADMIN not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains(new SecurityConfig("ROLE_ADMIN"))); - assertTrue("ROLE_USER not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains(new SecurityConfig("ROLE_USER"))); + SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor) messageChannel.interceptors + .get(0); + assertTrue("ROLE_ADMIN not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains( + new SecurityConfig("ROLE_ADMIN"))); + assertTrue("ROLE_USER not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains( + new SecurityConfig("ROLE_USER"))); assertNull("Send security attribute were not null", interceptor.getSendSecurityAttributes()); } - + @Test - public void testAdminRequiredForSendAndReceive(){ - applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, "adminForSendAndReceive"); + public void testAdminRequiredForSendAndReceive() { + applicationContext.getAutowireCapableBeanFactory().applyBeanPostProcessorsAfterInitialization(messageChannel, + "adminForSendAndReceive"); assertEquals("Wrong count of interceptors ", 1, messageChannel.interceptors.size()); - SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor)messageChannel.interceptors.get(0); - assertTrue("ROLE_ADMIN not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains(new SecurityConfig("ROLE_ADMIN"))); - assertTrue("ROLE_USER not found as send attribute", interceptor.getSendSecurityAttributes().contains(new SecurityConfig("ROLE_ADMIN"))); + SecurityEnforcingChannelInterceptor interceptor = (SecurityEnforcingChannelInterceptor) messageChannel.interceptors + .get(0); + assertTrue("ROLE_ADMIN not found as receive attribute", interceptor.getReceiveSecurityAttributes().contains( + new SecurityConfig("ROLE_ADMIN"))); + assertTrue("ROLE_USER not found as send attribute", interceptor.getSendSecurityAttributes().contains( + new SecurityConfig("ROLE_ADMIN"))); } - - - - - - + static class TestMessageChannel extends AbstractMessageChannel { - List interceptors = new ArrayList(); - + List interceptors = new ArrayList(); + public TestMessageChannel() { super(null); } @@ -134,7 +146,7 @@ public class SecuredChannelsParserTests extends AbstractJUnit4SpringContextTests public void addInterceptor(ChannelInterceptor interceptor) { interceptors.add(interceptor); } - + } }