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

Merge pull request #602 from ikucuze/master 

AMQ-8116 ActiveMQWildcardPermission buggy
This commit is contained in:
Jean-Baptiste Onofré 2021-01-07 12:30:25 +01:00 committed by GitHub
parent 3897d78776 9cf9d20d51
commit 33635f516f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
activemq-shiro/src/main/java/org/apache/activemq/shiro/authz/ActiveMQWildcardPermission.java
View File

@ -59,18 +59,25 @@ public class ActiveMQWildcardPermission extends WildcardPermission {
} else { } else {
Set<String> thisPart = getParts().get(i); Set<String> thisPart = getParts().get(i);
for (String token : thisPart) { // all tokens from otherPart must pass at least one token from thisPart
if (token.equals(WILDCARD_TOKEN)) { for (String otherToken : otherPart) {
continue; if (!caseSensitive) {
otherToken = otherToken.toLowerCase();
} }
for (String otherToken : otherPart) { boolean otherIsMatched = false;
if (!caseSensitive) { for (String token : thisPart) {
otherToken = otherToken.toLowerCase(); if (token.equals(WILDCARD_TOKEN)) {
otherIsMatched = true;
break;
} }
if (!matches(token, otherToken)) { if (matches(token, otherToken)) {
return false; otherIsMatched = true;
break;
} }
} }
if (!otherIsMatched) {
return false;
}
} }
i++; i++;
} }

4
activemq-shiro/src/test/java/org/apache/activemq/shiro/authz/ActiveMQWildcardPermissionTest.java
View File

@ -117,6 +117,10 @@ public class ActiveMQWildcardPermissionTest {
assertNoMatch("*:ActiveMQ*", "topic:TEST:*"); assertNoMatch("*:ActiveMQ*", "topic:TEST:*");
assertMatch("topic:ActiveMQ.Advisory*", "topic:ActiveMQ.Advisory.Connection:create"); assertMatch("topic:ActiveMQ.Advisory*", "topic:ActiveMQ.Advisory.Connection:create");
assertMatch("foo?ar", "foobar"); assertMatch("foo?ar", "foobar");
assertMatch("queue:*:read,write", "queue:testqueue:read");
assertMatch("queue:*:read,write", "queue:test*:read,write");
assertNoMatch("queue:*:read,write", "queue:*:read,write,delete");
} }
protected static void assertMatch(String pattern, String value) { protected static void assertMatch(String pattern, String value) {