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/ObjectProperties.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker/src') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java index 1c18887f4d..a9ec4d1647 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java @@ -319,8 +319,8 @@ public class ObjectProperties || ruleValue.equals(STAR) || (ruleValue.endsWith(STAR) && thisValue != null - && thisValue.length() > ruleValue.length() - && thisValue.startsWith(ruleValue.substring(0, ruleValue.length() - 2))); + && thisValue.length() >= ruleValue.length() - 1 + && thisValue.startsWith(ruleValue.substring(0, ruleValue.length() - 1))); } @Override -- cgit v1.2.1