You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2014/05/05 10:13:55 UTC
[2/2] git commit: Initial fix for AMQ-5160 to support subscription
authorization for destination filters
Initial fix for AMQ-5160 to support subscription authorization for destination filters
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a38a7c00
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a38a7c00
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a38a7c00
Branch: refs/heads/trunk
Commit: a38a7c00933b001578a5fe54c8d91746088b5f47
Parents: 89e8767
Author: Dhiraj Bokde <db...@redhat.com>
Authored: Thu May 1 11:21:50 2014 -0700
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Mon May 5 10:06:06 2014 +0200
----------------------------------------------------------------------
.../activemq/broker/region/AbstractRegion.java | 24 +++++++--
.../region/CompositeDestinationInterceptor.java | 5 ++
.../activemq/security/AuthorizationBroker.java | 19 +++++++-
.../AuthorizationDestinationFilter.java | 48 ++++++++++++++++++
.../AuthorizationDestinationInterceptor.java | 51 ++++++++++++++++++++
.../org/apache/activemq/AuthorizationTest.java | 4 +-
6 files changed, 143 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a38a7c00/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
index 2d1171d..9760501 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
@@ -165,8 +165,12 @@ public abstract class AbstractRegion implements Region {
for (Iterator<Subscription> iter = subscriptions.values().iterator(); iter.hasNext();) {
Subscription sub = iter.next();
if (sub.matches(dest.getActiveMQDestination())) {
- dest.addSubscription(context, sub);
- rc.add(sub);
+ try {
+ dest.addSubscription(context, sub);
+ rc.add(sub);
+ } catch (Exception e) {
+ LOG.error("Subscription error for " + sub + ": " + e.getMessage(), e);
+ }
}
}
return rc;
@@ -290,8 +294,6 @@ public abstract class AbstractRegion implements Region {
Subscription sub = createSubscription(context, info);
- subscriptions.put(info.getConsumerId(), sub);
-
// At this point we're done directly manipulating subscriptions,
// but we need to retain the synchronized block here. Consider
// otherwise what would happen if at this point a second
@@ -311,14 +313,26 @@ public abstract class AbstractRegion implements Region {
destinationsLock.readLock().unlock();
}
+ List<Destination> removeList = new ArrayList<Destination>();
for (Destination dest : addList) {
- dest.addSubscription(context, sub);
+ try {
+ dest.addSubscription(context, sub);
+ removeList.add(dest);
+ } finally {
+ // remove subscriptions added earlier
+ for (Destination remove : removeList) {
+ remove.removeSubscription(context, sub, info.getLastDeliveredSequenceId());
+ }
+ }
}
+ removeList.clear();
if (info.isBrowser()) {
((QueueBrowserSubscription) sub).destinationsAdded();
}
+ subscriptions.put(info.getConsumerId(), sub);
+
return sub;
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/a38a7c00/activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
index b96a5ef..35250d3a 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/CompositeDestinationInterceptor.java
@@ -56,4 +56,9 @@ public class CompositeDestinationInterceptor implements DestinationInterceptor {
public void setInterceptors(final DestinationInterceptor[] interceptors) {
this.interceptors = interceptors;
}
+
+ public DestinationInterceptor[] getInterceptors() {
+ return interceptors;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/a38a7c00/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
index bce1a09..7b254e4 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
@@ -16,12 +16,17 @@
*/
package org.apache.activemq.security;
+import java.util.Arrays;
import java.util.Set;
+
import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.BrokerFilter;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.broker.ProducerBrokerExchange;
+import org.apache.activemq.broker.region.CompositeDestinationInterceptor;
import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationInterceptor;
+import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
@@ -44,13 +49,25 @@ public class AuthorizationBroker extends BrokerFilter implements SecurityAdminMB
public AuthorizationBroker(Broker next, AuthorizationMap authorizationMap) {
super(next);
this.authorizationMap = authorizationMap;
+
+ // add DestinationInterceptor
+ final RegionBroker regionBroker = (RegionBroker) next.getAdaptor(RegionBroker.class);
+ final CompositeDestinationInterceptor compositeInterceptor = (CompositeDestinationInterceptor) regionBroker.getDestinationInterceptor();
+ DestinationInterceptor[] interceptors = compositeInterceptor.getInterceptors();
+ interceptors = Arrays.copyOf(interceptors, interceptors.length + 1);
+ interceptors[interceptors.length - 1] = new AuthorizationDestinationInterceptor(this);
+ compositeInterceptor.setInterceptors(interceptors);
+ }
+
+ public AuthorizationMap getAuthorizationMap() {
+ return authorizationMap;
}
public void setAuthorizationMap(AuthorizationMap map) {
authorizationMap = map;
}
- protected SecurityContext checkSecurityContext(ConnectionContext context) throws SecurityException {
+ public SecurityContext checkSecurityContext(ConnectionContext context) throws SecurityException {
final SecurityContext securityContext = context.getSecurityContext();
if (securityContext == null) {
throw new SecurityException("User is not authenticated.");
http://git-wip-us.apache.org/repos/asf/activemq/blob/a38a7c00/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationFilter.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationFilter.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationFilter.java
new file mode 100644
index 0000000..6f9012e
--- /dev/null
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationFilter.java
@@ -0,0 +1,48 @@
+package org.apache.activemq.security;
+
+import java.util.Set;
+
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationFilter;
+import org.apache.activemq.broker.region.Subscription;
+import org.apache.activemq.command.ActiveMQDestination;
+
+/**
+ * Authorizes addSubscription calls.
+ */
+public class AuthorizationDestinationFilter extends DestinationFilter {
+
+ private final AuthorizationBroker broker;
+
+ public AuthorizationDestinationFilter(Destination destination, AuthorizationBroker broker) {
+ super(destination);
+ this.broker = broker;
+ }
+
+ @Override
+ public void addSubscription(ConnectionContext context, Subscription sub) throws Exception {
+ // authorize subscription
+ final SecurityContext securityContext = broker.checkSecurityContext(context);
+
+ final AuthorizationMap authorizationMap = broker.getAuthorizationMap();
+ // use the destination being filtered, instead of the destination from the consumerinfo in the subscription
+ // since that could be a wildcard destination
+ final ActiveMQDestination destination = next.getActiveMQDestination();
+
+ Set<?> allowedACLs;
+ if (!destination.isTemporary()) {
+ allowedACLs = authorizationMap.getReadACLs(destination);
+ } else {
+ allowedACLs = authorizationMap.getTempDestinationReadACLs();
+ }
+
+ if (!securityContext.isBrokerContext() && allowedACLs != null && !securityContext.isInOneOf(allowedACLs) ) {
+ throw new SecurityException("User " + securityContext.getUserName() + " is not authorized to read from: " + destination);
+ }
+ securityContext.getAuthorizedReadDests().put(destination, destination);
+
+ super.addSubscription(context, sub);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq/blob/a38a7c00/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationInterceptor.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationInterceptor.java
new file mode 100644
index 0000000..ab27fd7
--- /dev/null
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationDestinationInterceptor.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.security;
+
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationInterceptor;
+import org.apache.activemq.command.ActiveMQDestination;
+
+/**
+ * Adds AuthorizationDestinationFilter on intercept()
+ */
+public class AuthorizationDestinationInterceptor implements DestinationInterceptor {
+
+ private final AuthorizationBroker broker;
+
+ public AuthorizationDestinationInterceptor(AuthorizationBroker broker) {
+ this.broker = broker;
+ }
+
+ @Override
+ public Destination intercept(Destination destination) {
+ return new AuthorizationDestinationFilter(destination, broker);
+ }
+
+ @Override
+ public void remove(Destination destination) {
+ // do nothing
+ }
+
+ @Override
+ public void create(Broker broker, ConnectionContext context, ActiveMQDestination destination) throws Exception {
+ // do nothing
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq/blob/a38a7c00/activemq-runtime-config/src/test/java/org/apache/activemq/AuthorizationTest.java
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/java/org/apache/activemq/AuthorizationTest.java b/activemq-runtime-config/src/test/java/org/apache/activemq/AuthorizationTest.java
index ce3e71e..33e762b 100644
--- a/activemq-runtime-config/src/test/java/org/apache/activemq/AuthorizationTest.java
+++ b/activemq-runtime-config/src/test/java/org/apache/activemq/AuthorizationTest.java
@@ -18,11 +18,10 @@ package org.apache.activemq;
import javax.jms.JMSException;
import javax.jms.Session;
-import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.Test;
public class AuthorizationTest extends RuntimeConfigTestSupport {
@@ -45,6 +44,7 @@ public class AuthorizationTest extends RuntimeConfigTestSupport {
assertAllowed("user", "USERS.A");
assertAllowed("guest", "GUESTS.A");
assertDenied("user", "GUESTS.A");
+ assertDenied("user", ">");
assertAllowedTemp("guest");
}