Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-18 07:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6116 - improve security context

Browse Source
This commit is contained in:
Dejan Bosanac 2016-01-08 17:05:58 +01:00
parent 43d493e527
commit 5f8a3df5a4
6 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/security/AbstractAuthenticationBroker.java
View File

@ -38,7 +38,6 @@ public abstract class AbstractAuthenticationBroker extends BrokerFilter implemen
next.removeDestination(context, destination, timeout); next.removeDestination(context, destination, timeout);
for (SecurityContext sc : securityContexts) { for (SecurityContext sc : securityContexts) {
sc.getAuthorizedReadDests().remove(destination);
sc.getAuthorizedWriteDests().remove(destination); sc.getAuthorizedWriteDests().remove(destination);
} }
} }
@ -53,7 +52,6 @@ public abstract class AbstractAuthenticationBroker extends BrokerFilter implemen
public void refresh() { public void refresh() {
for (SecurityContext sc : securityContexts) { for (SecurityContext sc : securityContexts) {
sc.getAuthorizedReadDests().clear();
sc.getAuthorizedWriteDests().clear(); sc.getAuthorizedWriteDests().clear();
} }
} }

5
activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
View File

@ -126,6 +126,8 @@ public class AuthorizationBroker extends BrokerFilter implements SecurityAdminMB
throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to remove: " + destination); throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to remove: " + destination);
} }
securityContext.getAuthorizedWriteDests().remove(destination);
super.removeDestination(context, destination, timeout); super.removeDestination(context, destination, timeout);
} }
@ -137,6 +139,8 @@ public class AuthorizationBroker extends BrokerFilter implements SecurityAdminMB
throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to remove: " + info.getDestination()); throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to remove: " + info.getDestination());
} }
securityContext.getAuthorizedWriteDests().remove(info.getDestination());
super.removeDestinationInfo(context, info); super.removeDestinationInfo(context, info);
} }
@ -154,7 +158,6 @@ public class AuthorizationBroker extends BrokerFilter implements SecurityAdminMB
if (!securityContext.isBrokerContext() && allowedACLs != null && !securityContext.isInOneOf(allowedACLs) ) { if (!securityContext.isBrokerContext() && allowedACLs != null && !securityContext.isInOneOf(allowedACLs) ) {
throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to read from: " + info.getDestination()); throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to read from: " + info.getDestination());
} }
securityContext.getAuthorizedReadDests().put(info.getDestination(), info.getDestination());
/* /*
* Need to think about this a little more. We could do per message * Need to think about this a little more. We could do per message

1
activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationFilter.java
View File

@ -56,7 +56,6 @@ public class AuthorizationDestinationFilter extends DestinationFilter {
if (!securityContext.isBrokerContext() && allowedACLs != null && !securityContext.isInOneOf(allowedACLs) ) { if (!securityContext.isBrokerContext() && allowedACLs != null && !securityContext.isInOneOf(allowedACLs) ) {
throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to read from: " + destination); throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to read from: " + destination);
} }
securityContext.getAuthorizedReadDests().put(destination, destination);
super.addSubscription(context, sub); super.addSubscription(context, sub);
} }

5
activemq-broker/src/main/java/org/apache/activemq/security/SecurityContext.java
View File

@ -47,7 +47,6 @@ public abstract class SecurityContext {
final String userName; final String userName;
final ConcurrentMap<ActiveMQDestination, ActiveMQDestination> authorizedReadDests = new ConcurrentHashMap<ActiveMQDestination, ActiveMQDestination>();
final ConcurrentMap<ActiveMQDestination, ActiveMQDestination> authorizedWriteDests = new ConcurrentHashMap<ActiveMQDestination, ActiveMQDestination>(); final ConcurrentMap<ActiveMQDestination, ActiveMQDestination> authorizedWriteDests = new ConcurrentHashMap<ActiveMQDestination, ActiveMQDestination>();
public SecurityContext(String userName) { public SecurityContext(String userName) {
@ -74,10 +73,6 @@ public abstract class SecurityContext {
return userName; return userName;
} }
public ConcurrentMap<ActiveMQDestination, ActiveMQDestination> getAuthorizedReadDests() {
return authorizedReadDests;
}
public ConcurrentMap<ActiveMQDestination, ActiveMQDestination> getAuthorizedWriteDests() { public ConcurrentMap<ActiveMQDestination, ActiveMQDestination> getAuthorizedWriteDests() {
return authorizedWriteDests; return authorizedWriteDests;
} }

5
activemq-shiro/src/main/java/org/apache/activemq/shiro/subject/SubjectSecurityContext.java
View File

@ -72,11 +72,6 @@ public class SubjectSecurityContext extends SecurityContext {
throw notAllowed("isInOneOf"); throw notAllowed("isInOneOf");
} }
@Override
public ConcurrentMap<ActiveMQDestination, ActiveMQDestination> getAuthorizedReadDests() {
throw notAllowed("getAuthorizedReadDests");
}
@Override @Override
public ConcurrentMap<ActiveMQDestination, ActiveMQDestination> getAuthorizedWriteDests() { public ConcurrentMap<ActiveMQDestination, ActiveMQDestination> getAuthorizedWriteDests() {
throw notAllowed("getAuthorizedWriteDests"); throw notAllowed("getAuthorizedWriteDests");

5
activemq-shiro/src/test/java/org/apache/activemq/shiro/subject/SubjectSecurityContextTest.java
View File

@ -41,11 +41,6 @@ public class SubjectSecurityContextTest {
ctx.isInOneOf(null); ctx.isInOneOf(null);
} }
@Test(expected=UnsupportedOperationException.class)
public void testGetAuthorizedReadDests() {
ctx.getAuthorizedReadDests();
}
@Test(expected=UnsupportedOperationException.class) @Test(expected=UnsupportedOperationException.class)
public void testGetAuthorizedWriteDests() { public void testGetAuthorizedWriteDests() {
ctx.getAuthorizedWriteDests(); ctx.getAuthorizedWriteDests();