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

added fix for https://issues.apache.org/activemq/browse/AMQ-908 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@486131 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonas B. Lim 2006-12-12 13:19:03 +00:00
parent 0a361e504a
commit 16546f951a
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
activemq-core/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
View File

@ -41,6 +41,10 @@ public class AuthorizationEntry extends DestinationMapEntry {
private Set writeACLs = Collections.EMPTY_SET; private Set writeACLs = Collections.EMPTY_SET;
private Set adminACLs = Collections.EMPTY_SET; private Set adminACLs = Collections.EMPTY_SET;
private String adminRoles = null;
private String readRoles = null;
private String writeRoles = null;
private String groupClass = "org.apache.activemq.jaas.GroupPrincipal"; private String groupClass = "org.apache.activemq.jaas.GroupPrincipal";
public String getGroupClass() { public String getGroupClass() {
@ -76,17 +80,23 @@ public class AuthorizationEntry extends DestinationMapEntry {
} }
// helper methods for easier configuration in Spring // helper methods for easier configuration in Spring
// ACLs are already set in the afterPropertiesSet method to ensure that groupClass is set first before
// calling parceACLs() on any of the roles. We still need to add the call to parceACLs inside the helper
// methods for instances where we configure security programatically without using xbean
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
public void setAdmin(String roles) throws Exception { public void setAdmin(String roles) throws Exception {
setAdminACLs(parseACLs(roles)); adminRoles = roles;
setAdminACLs(parseACLs(adminRoles));
} }
public void setRead(String roles) throws Exception { public void setRead(String roles) throws Exception {
setReadACLs(parseACLs(roles)); readRoles = roles;
setReadACLs(parseACLs(readRoles));
} }
public void setWrite(String roles) throws Exception { public void setWrite(String roles) throws Exception {
setWriteACLs(parseACLs(roles)); writeRoles = roles;
setWriteACLs(parseACLs(writeRoles));
} }
protected Set parseACLs(String roles) throws Exception { protected Set parseACLs(String roles) throws Exception {
@ -133,4 +143,21 @@ public class AuthorizationEntry extends DestinationMapEntry {
} }
return answer; return answer;
} }
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
if(adminRoles!=null) {
setAdminACLs(parseACLs(adminRoles));
}
if(writeRoles!=null) {
setWriteACLs(parseACLs(writeRoles));
}
if(readRoles!=null) {
setReadACLs(parseACLs(readRoles));
}
}
} }