Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding a patch to fix AMQ-1157 allowing a broker security context to be used to allow destinations to be created on startup etc. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2007-02-07 15:35:10 +00:00
parent 6e7e3abf5d
commit 1d882e981c
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -69,6 +69,7 @@ import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.network.jms.JmsConnector; import org.apache.activemq.network.jms.JmsConnector;
import org.apache.activemq.proxy.ProxyConnector; import org.apache.activemq.proxy.ProxyConnector;
import org.apache.activemq.security.MessageAuthorizationPolicy; import org.apache.activemq.security.MessageAuthorizationPolicy;
import org.apache.activemq.security.SecurityContext;
import org.apache.activemq.store.DefaultPersistenceAdapterFactory; import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.PersistenceAdapterFactory; import org.apache.activemq.store.PersistenceAdapterFactory;
@ -1454,6 +1455,7 @@ public class BrokerService implements Service, Serializable {
protected ConnectionContext createAdminConnectionContext() throws Exception { protected ConnectionContext createAdminConnectionContext() throws Exception {
ConnectionContext context = new ConnectionContext(); ConnectionContext context = new ConnectionContext();
context.setBroker(getBroker()); context.setBroker(getBroker());
context.setSecurityContext(SecurityContext.BROKER_SECURITY_CONTEXT);
return context; return context;
} }

24
activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
View File

@ -58,18 +58,20 @@ public class AuthorizationBroker extends BrokerFilter implements SecurityAdminMB
//if(!((ActiveMQTempDestination)destination).getConnectionId().equals(context.getConnectionId().getValue()) ) { //if(!((ActiveMQTempDestination)destination).getConnectionId().equals(context.getConnectionId().getValue()) ) {
Set allowedACLs = null; if (!securityContext.isBrokerContext()) {
if(!destination.isTemporary()) { Set allowedACLs = null;
allowedACLs = authorizationMap.getAdminACLs(destination); if(!destination.isTemporary()) {
} else { allowedACLs = authorizationMap.getAdminACLs(destination);
allowedACLs = authorizationMap.getTempDestinationAdminACLs(); } else {
} allowedACLs = authorizationMap.getTempDestinationAdminACLs();
}
if(allowedACLs!=null && !securityContext.isInOneOf(allowedACLs))
throw new SecurityException("User "+securityContext.getUserName()+" is not authorized to create: "+destination); if(allowedACLs!=null && !securityContext.isInOneOf(allowedACLs))
throw new SecurityException("User "+securityContext.getUserName()+" is not authorized to create: "+destination);
}
// }
// }
return super.addDestination(context, destination); return super.addDestination(context, destination);
} }

19
activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java
View File

@ -19,7 +19,7 @@ package org.apache.activemq.security;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
@ -29,6 +29,17 @@ import java.util.concurrent.ConcurrentHashMap;
*/ */
abstract public class SecurityContext { abstract public class SecurityContext {
public static final SecurityContext BROKER_SECURITY_CONTEXT = new SecurityContext("ActiveMQBroker") {
@Override
public boolean isBrokerContext() {
return true;
}
public Set getPrincipals() {
return Collections.EMPTY_SET;
}
};
final String userName; final String userName;
final ConcurrentHashMap authorizedReadDests = new ConcurrentHashMap(); final ConcurrentHashMap authorizedReadDests = new ConcurrentHashMap();
@ -53,8 +64,12 @@ abstract public class SecurityContext {
public ConcurrentHashMap getAuthorizedReadDests() { public ConcurrentHashMap getAuthorizedReadDests() {
return authorizedReadDests; return authorizedReadDests;
} }
public ConcurrentHashMap getAuthorizedWriteDests() { public ConcurrentHashMap getAuthorizedWriteDests() {
return authorizedWriteDests; return authorizedWriteDests;
} }
public boolean isBrokerContext() {
return false;
}
} }