diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-02-16 11:24:02 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-02-16 11:24:02 +0000 |
| commit | c41c4ed614a2ec7e015aa65d518e18afde4d91c2 (patch) | |
| tree | 0eb75d58be8cf5ddb721bfafe5b09859e746b2a2 /qpid/java/broker-plugins/access-control/src/main | |
| parent | e43b1ec6d41f5a26a9eeca756247cb82ab8e5d1f (diff) | |
| download | qpid-python-c41c4ed614a2ec7e015aa65d518e18afde4d91c2.tar.gz | |
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 <orudyy@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1244934 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control/src/main')
| -rw-r--r-- | qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java | 7 |
1 files changed, 3 insertions, 4 deletions
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())); } /** |