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 | a3b5991ac1f4d0e7ffd856ae714c089bb0ed238a (patch) | |
| tree | 162091dffb03404f7773596fdcfef352e2f13214 /java/broker/src/main/java/org | |
| parent | b6ff34c69aa522a7edd0478f22e3b7b72917ce2a (diff) | |
| download | qpid-python-a3b5991ac1f4d0e7ffd856ae714c089bb0ed238a.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/qpid@1244934 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main/java/org')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java index 1c18887f4d..a9ec4d1647 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java +++ b/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 |