Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated service-activator to use new SimpleEndpoint and DefaultMessageHandler. Modified EndpointInterceptor for preHandle/aroundHandle/postHandle with access-to and return-values-for the request/reply Messages.

Browse Source
This commit is contained in:
Mark Fisher
2008-08-11 19:39:42 +00:00
parent c61ae015f4
commit 8732ac26b4
18 changed files with 631 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.integration.security/src/main/java/org/springframework/integration/security/endpoint/SecurityEndpointInterceptor.java
View File

@@ -18,7 +18,6 @@ package org.springframework.integration.security.endpoint;
import org.springframework.integration.endpoint.interceptor.EndpointInterceptorAdapter;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageTarget;
import org.springframework.integration.security.SecurityContextUtils;
import org.springframework.security.AccessDecisionManager;
import org.springframework.security.ConfigAttributeDefinition;
@@ -42,7 +41,7 @@ public class SecurityEndpointInterceptor extends EndpointInterceptorAdapter {
}
@Override
public boolean aroundSend(Message<?> message, MessageTarget endpoint) {
public Message<?> preHandle(Message<?> message) {
SecurityContext securityContext = null;
if (message != null) {
securityContext = SecurityContextUtils.getSecurityContextFromHeader(message);
@@ -51,8 +50,8 @@ public class SecurityEndpointInterceptor extends EndpointInterceptorAdapter {
try {
SecurityContextHolder.setContext(securityContext);
this.accessDecisionManager.decide(SecurityContextHolder.getContext().getAuthentication(),
endpoint, this.targetSecurityAttributes);
return endpoint.send(message);
message, this.targetSecurityAttributes);
return message;
}
finally {
SecurityContextHolder.clearContext();
@@ -60,8 +59,8 @@ public class SecurityEndpointInterceptor extends EndpointInterceptorAdapter {
}
else {
this.accessDecisionManager.decide(SecurityContextHolder.getContext().getAuthentication(),
endpoint, this.targetSecurityAttributes);
return endpoint.send(message);
message, this.targetSecurityAttributes);
return message;
}
}

10
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest.java
View File

@@ -24,6 +24,7 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.security.SecurityTestUtil;
import org.springframework.security.AccessDeniedException;
@@ -67,9 +68,14 @@ public class EndpointSecurityIntegrationTest extends AbstractJUnit4SpringContext
@Test(expected = AccessDeniedException.class)
@DirtiesContext
public void testWithoutPermision() {
public void testWithoutPermision() throws Throwable {
login("bob", "bobspassword", "ROLE_USER");
input.send(new StringMessage("test"));
try {
input.send(new StringMessage("test"));
}
catch (MessageDeliveryException e) {
throw e.getCause().getCause();
}
}

39
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/SecurityEndpointInterceptorTests.java
View File

@@ -22,12 +22,8 @@ import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertNull;
import org.junit.Before;
import org.junit.Test;
import org.springframework.integration.endpoint.HandlerEndpoint;
import org.springframework.integration.endpoint.MessageEndpoint;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.security.SecurityContextUtils;
@@ -44,32 +40,18 @@ import org.springframework.security.context.SecurityContextHolder;
*/
public class SecurityEndpointInterceptorTests {
private MessageEndpoint endpoint;
@Before
public void createEndpoint() throws Exception {
HandlerEndpoint endpoint = new HandlerEndpoint(new MessageHandler() {
public Message<?> handle(Message<?> message) {
return null;
}
});
endpoint.afterPropertiesSet();
this.endpoint = endpoint;
}
@Test(expected = AccessDeniedException.class)
public void testUnauthenticatedAccessToSecuredEndpointWithNullMessage() throws Throwable {
try {
Message<?> message = null;
ConfigAttributeDefinition attDefintion = new ConfigAttributeDefinition("ROLE_ADMIN");
AccessDecisionManager adm = createMock(AccessDecisionManager.class);
adm.decide(null, endpoint, attDefintion);
adm.decide(null, message, attDefintion);
expectLastCall().andThrow(new AccessDeniedException("nope"));
replay(adm);
SecurityEndpointInterceptor interceptor = new SecurityEndpointInterceptor(attDefintion, adm);
interceptor.aroundSend(null, endpoint);
interceptor.preHandle(message);
verify(adm);
}
finally {
@@ -81,14 +63,15 @@ public class SecurityEndpointInterceptorTests {
@Test(expected = AccessDeniedException.class)
public void testUnauthenticatedAccessToSecuredEndpointWithNoSecurityContext() throws Throwable {
try {
Message<?> message = this.createMessageWithoutContext();
ConfigAttributeDefinition attDefintion = new ConfigAttributeDefinition("ROLE_ADMIN");
AccessDecisionManager adm = createMock(AccessDecisionManager.class);
adm.decide(null, endpoint, attDefintion);
adm.decide(null, message, attDefintion);
expectLastCall().andThrow(new AccessDeniedException("nope"));
replay(adm);
SecurityEndpointInterceptor interceptor = new SecurityEndpointInterceptor(attDefintion, adm);
interceptor.aroundSend(this.createMessageWithoutContext(), endpoint);
interceptor.preHandle(message);
verify(adm);
}
finally {
@@ -103,14 +86,15 @@ public class SecurityEndpointInterceptorTests {
SecurityContext context = SecurityTestUtil.createContext("bob", "bobspassword",
new String[] { "ROLE_ADMIN" });
ConfigAttributeDefinition attDefintion = new ConfigAttributeDefinition("ROLE_ADMIN");
Message<?> message = this.createMessageWithContext(context);
AccessDecisionManager adm = createMock(AccessDecisionManager.class);
adm.decide(context.getAuthentication(), endpoint, attDefintion);
adm.decide(context.getAuthentication(), message, attDefintion);
expectLastCall().andThrow(new AccessDeniedException("nope"));
replay(adm);
SecurityEndpointInterceptor interceptor = new SecurityEndpointInterceptor(attDefintion, adm);
interceptor.aroundSend(this.createMessageWithContext(context), endpoint);
interceptor.preHandle(message);
verify(adm);
}
finally {
@@ -125,13 +109,14 @@ public class SecurityEndpointInterceptorTests {
SecurityContext context = SecurityTestUtil.createContext("bob", "bobspassword",
new String[] { "ROLE_ADMIN" });
ConfigAttributeDefinition attDefintion = new ConfigAttributeDefinition("ROLE_ADMIN");
Message<?> message = this.createMessageWithContext(context);
AccessDecisionManager adm = createMock(AccessDecisionManager.class);
adm.decide(context.getAuthentication(), endpoint, attDefintion);
adm.decide(context.getAuthentication(), message, attDefintion);
expectLastCall();
replay(adm);
SecurityEndpointInterceptor interceptor = new SecurityEndpointInterceptor(attDefintion, adm);
interceptor.aroundSend(this.createMessageWithContext(context), endpoint);
interceptor.preHandle(message);
verify(adm);
}
finally {