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

https://issues.apache.org/jira/browse/AMQ-5697 - authorization map and composite destinations

This commit is contained in:
Dejan Bosanac 2015-03-31 17:13:27 +02:00
parent a39e51e051
commit 8bb58036a0
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
View File

@ -111,4 +111,28 @@ public class AuthorizationEntry extends DestinationMapEntry {
}
return answer;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof AuthorizationEntry)) return false;
AuthorizationEntry that = (AuthorizationEntry) o;
if (adminRoles != null ? !adminRoles.equals(that.adminRoles) : that.adminRoles != null) return false;
if (groupClass != null ? !groupClass.equals(that.groupClass) : that.groupClass != null) return false;
if (readRoles != null ? !readRoles.equals(that.readRoles) : that.readRoles != null) return false;
if (writeRoles != null ? !writeRoles.equals(that.writeRoles) : that.writeRoles != null) return false;
return true;
}
@Override
public int hashCode() {
int result = adminRoles != null ? adminRoles.hashCode() : 0;
result = 31 * result + (readRoles != null ? readRoles.hashCode() : 0);
result = 31 * result + (writeRoles != null ? writeRoles.hashCode() : 0);
result = 31 * result + (groupClass != null ? groupClass.hashCode() : 0);
return result;
}
}

14
activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java
View File

@ -44,12 +44,22 @@ public class AuthorizationMapTest extends TestCase {
}
public void testCompositeDoesNotBypassAuthorizationMap() {
AuthorizationMap map = createAuthorizationMap();
public void testComposite() {
DefaultAuthorizationMap map = (DefaultAuthorizationMap)createAuthorizationMap();
map.put(new ActiveMQQueue("QUEUEA"), createEntry("QUEUEA", "users", "users", "users"));
map.put(new ActiveMQQueue("QUEUEB"), createEntry("QUEUEB", "users", "users", "users"));
Set<?> readACLs = map.getReadACLs(new ActiveMQQueue("USERS.FOO.BAR,DENIED"));
assertEquals("set size: " + readACLs, 1, readACLs.size());
assertTrue("Contains users group", readACLs.contains(ADMINS));
readACLs = map.getReadACLs(new ActiveMQQueue("USERS.FOO.BAR,USERS.BAR.FOO"));
assertEquals("set size: " + readACLs, 2, readACLs.size());
assertTrue("Contains users group", readACLs.contains(USERS));
readACLs = map.getReadACLs(new ActiveMQQueue("QUEUEA,QUEUEB"));
assertEquals("set size: " + readACLs, 2, readACLs.size());
assertTrue("Contains users group", readACLs.contains(USERS));
}
public void testAuthorizationMapWithTempDest() {