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

fixed bug in stack security strategy which was not removing the context correctly

Browse Source
This commit is contained in:
Jonas Partner
2008-06-20 14:56:20 +00:00
parent 5c8e41c54a
commit 77faf4fe5e
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration.security/src/main/java/org/springframework/integration/security/StackBasedSecurityContextHolderStrategy.java
View File

@@ -39,7 +39,7 @@ public class StackBasedSecurityContextHolderStrategy implements SecurityContextH
public void clearContext() {
if (getStackForThread().size() > 0) {
SecurityContext ctx = getStackForThread().poll();
SecurityContext ctx = getStackForThread().removeFirst();
logger.debug("Popped security context " + ctx);
}
}
@@ -47,7 +47,7 @@ public class StackBasedSecurityContextHolderStrategy implements SecurityContextH
public SecurityContext getContext() {
if (getStackForThread().peek() == null) {
logger.debug("Pushed new blank security context");
getStackForThread().offer(new SecurityContextImpl());
getStackForThread().addFirst(new SecurityContextImpl());
}
return (SecurityContext) getStackForThread().peek();
@@ -56,7 +56,7 @@ public class StackBasedSecurityContextHolderStrategy implements SecurityContextH
public void setContext(SecurityContext context) {
Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
getStackForThread().offer(context);
getStackForThread().addFirst(context);
logger.debug("Pushed context " + context);
}

2
org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextAssociatingHandlerInterceptorTests.java
View File

@@ -22,8 +22,6 @@ import static org.junit.Assert.assertNull;
import org.junit.After;
import org.junit.Test;
import org.springframework.integration.dispatcher.DirectChannel;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.StringMessage;

3
org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextPropagatingChannelInterceptorTests.java
View File

@@ -77,9 +77,6 @@ public class SecurityContextPropagatingChannelInterceptorTests {
channel.send(message);
message = (StringMessage) channel.receive(0);
MessageHeader header = message.getHeader();
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
assertFalse("Security context header found when no security context existed.",
header.getAttributeNames().contains(SecurityContextPropagatingChannelInterceptor.SECURITY_CONTEXT_HEADER_ATTRIBUTE));
}

1
org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredParserTests.java
View File

@@ -76,7 +76,6 @@ public class SecuredParserTests extends AbstractJUnit4SpringContextTests{
public void testAdminRequiredForSendWithAccessGranted() {
login("jimi", "jimispassword");
adminRequiredForSend.send(new StringMessage("testmessage"));
SecurityContextHolder.clearContext();
assertNotNull("Message not received", adminRequiredForSend.receive(0));
}