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

refactor of the message-level security implementation so that it works with any QoS, not just queues. Also fixed bug in Message Groups where not setting the sequence ID broke the message groups 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@380688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-02-24 15:24:36 +00:00
parent a640ff5843
commit fbb26ba7d7
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
View File

@ -19,6 +19,8 @@ package org.apache.activemq.broker.region;
import javax.jms.InvalidSelectorException; import javax.jms.InvalidSelectorException;
import javax.jms.JMSException; import javax.jms.JMSException;
import java.io.IOException;
import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
@ -77,14 +79,14 @@ abstract public class AbstractSubscription implements Subscription {
return rc; return rc;
} }
public boolean matches(MessageReference node, MessageEvaluationContext context) { public boolean matches(MessageReference node, MessageEvaluationContext context) throws IOException {
ConsumerId targetConsumerId = node.getTargetConsumerId(); ConsumerId targetConsumerId = node.getTargetConsumerId();
if ( targetConsumerId!=null) { if ( targetConsumerId!=null) {
if( !targetConsumerId.equals(info.getConsumerId()) ) if( !targetConsumerId.equals(info.getConsumerId()) )
return false; return false;
} }
try { try {
return selector == null || selector.matches(context); return (selector == null || selector.matches(context)) && this.context.isAllowedToConsume(node);
} catch (JMSException e) { } catch (JMSException e) {
log.info("Selector failed to evaluate: " + e.getMessage(), e); log.info("Selector failed to evaluate: " + e.getMessage(), e);
return false; return false;

4
activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
View File

@ -18,6 +18,8 @@ package org.apache.activemq.broker.region;
import javax.jms.InvalidSelectorException; import javax.jms.InvalidSelectorException;
import java.io.IOException;
import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
@ -63,7 +65,7 @@ public class QueueBrowserSubscription extends PrefetchSubscription {
return super.createMessageDispatch(node, message); return super.createMessageDispatch(node, message);
} }
} }
public boolean matches(MessageReference node, MessageEvaluationContext context) { public boolean matches(MessageReference node, MessageEvaluationContext context) throws IOException {
return !browseDone && super.matches(node, context); return !browseDone && super.matches(node, context);
} }
} }

7
activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
View File

@ -72,11 +72,6 @@ public class QueueSubscription extends PrefetchSubscription {
if( node.isAcked() ) if( node.isAcked() )
return false; return false;
// allow user-level security
if (!context.isAllowedToConsume(n)) {
return false;
}
// Keep message groups together. // Keep message groups together.
String groupId = node.getGroupID(); String groupId = node.getGroupID();
int sequence = node.getGroupSequence(); int sequence = node.getGroupSequence();
@ -85,7 +80,7 @@ public class QueueSubscription extends PrefetchSubscription {
MessageGroupMap messageGroupOwners = ((Queue)node.getRegionDestination()).getMessageGroupOwners(); MessageGroupMap messageGroupOwners = ((Queue)node.getRegionDestination()).getMessageGroupOwners();
// If we can own the first, then no-one else should own the rest. // If we can own the first, then no-one else should own the rest.
if( sequence==0 ) { if( sequence == 1 ) {
if( node.lock(this) ) { if( node.lock(this) ) {
messageGroupOwners.put(groupId, info.getConsumerId()); messageGroupOwners.put(groupId, info.getConsumerId());
return true; return true;

3
activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java
View File

@ -51,8 +51,9 @@ public interface Subscription {
* @param node * @param node
* @param context * @param context
* @return * @return
* @throws IOException
*/ */
boolean matches(MessageReference node, MessageEvaluationContext context); boolean matches(MessageReference node, MessageEvaluationContext context) throws IOException;
/** /**
* Is the subscription interested in messages in the destination? * Is the subscription interested in messages in the destination?