From c41c4ed614a2ec7e015aa65d518e18afde4d91c2 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 16 Feb 2012 11:24:02 +0000 Subject: QPID-3843: ensure ACL rule evaluation for the ALL operation accounts for the object type and properties. Fix length used for property wildcarding checks. Applied patch from Oleksandr Rudyy git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1244934 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/security/access/config/Action.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'qpid/java/broker-plugins/access-control/src/main') diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java index 0a084c97fe..b887d1e079 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java @@ -109,10 +109,9 @@ public class Action /** @see Comparable#compareTo(Object) */ public boolean matches(Action a) { - return (Operation.ALL == a.getOperation() - || (getOperation() == a.getOperation() - && getObjectType() == a.getObjectType() - && _properties.matches(a.getProperties()))); + return ((Operation.ALL == a.getOperation() || getOperation() == a.getOperation()) + && (ObjectType.ALL == a.getObjectType() || getObjectType() == a.getObjectType()) + && _properties.matches(a.getProperties())); } /** -- cgit v1.2.1