applied patch for http://issues.apache.org/activemq/browse/AMQ-908

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480575 13f79535-47bb-0310-9956-ffa450edef68

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

@@ -18,8 +18,9 @@
 package org.apache.activemq.security;
 
 import org.apache.activemq.filter.DestinationMapEntry;
-import org.apache.activemq.jaas.GroupPrincipal;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -40,6 +41,16 @@ public class AuthorizationEntry extends DestinationMapEntry {
     private Set writeACLs = Collections.EMPTY_SET;
     private Set adminACLs = Collections.EMPTY_SET;
     
+    private String groupClass = "org.apache.activemq.jaas.GroupPrincipal";
+        
+    public String getGroupClass() {
+    	return groupClass;
+    }
+     
+    public void setGroupClass(String groupClass) {
+        this.groupClass = groupClass;
+    }    
+
     public Set getAdminACLs() {
         return adminACLs;
     }
@@ -66,24 +77,59 @@ public class AuthorizationEntry extends DestinationMapEntry {
 
     // helper methods for easier configuration in Spring
     // -------------------------------------------------------------------------
-    public void setAdmin(String roles) {
+    public void setAdmin(String roles) throws Exception {
         setAdminACLs(parseACLs(roles));
     }
 
-    public void setRead(String roles) {
+    public void setRead(String roles) throws Exception {
         setReadACLs(parseACLs(roles));
     }
 
-    public void setWrite(String roles) {
+    public void setWrite(String roles) throws Exception {
         setWriteACLs(parseACLs(roles));
     }
 
-    protected Set parseACLs(String roles) {
+    protected Set parseACLs(String roles) throws Exception {
         Set answer = new HashSet();
         StringTokenizer iter = new StringTokenizer(roles, ",");
         while (iter.hasMoreTokens()) {
             String name = iter.nextToken().trim();
-            answer.add(new GroupPrincipal(name));
+            Class[] paramClass = new Class[1];
+            paramClass[0] = String.class;
+            
+            Object[] param = new Object[1];
+            param[0] = new String(name);
+
+            try {
+            	Class cls = Class.forName(groupClass);
+            	
+            	Constructor[] constructors = cls.getConstructors();
+            	int i;
+            	for (i=0; i<constructors.length; i++) {
+            		Class[] paramTypes = constructors[i].getParameterTypes(); 
+            		if (paramTypes.length!=0 && paramTypes[0].equals(paramClass[0])) break;
+            	}
+            	if (i < constructors.length) {
+            		Object instance = constructors[i].newInstance(param);
+                	answer.add(instance);
+            	}
+            	else {
+            		Object instance = cls.newInstance();
+            		Method[] methods = cls.getMethods();
+            		i=0;
+            		for (i=0; i<methods.length; i++) {
+            			Class[] paramTypes = methods[i].getParameterTypes();
+            			if (paramTypes.length!=0 && methods[i].getName().equals("setName") && paramTypes[0].equals(paramClass[0])) break;
+            		}
+                		
+                	if (i < methods.length) {
+                		methods[i].invoke(instance, param);
+                    	answer.add(instance);
+                	}
+                	else throw new NoSuchMethodException();
+            	}
+            }
+            catch (Exception e) { throw e; }
         }
         return answer;
     }

activemq-core/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java

@@ -65,13 +65,24 @@ public class AuthorizationMapTest extends TestCase {
         List entries = new ArrayList();
 
         AuthorizationEntry entry = new AuthorizationEntry();
+        entry.setGroupClass("org.apache.activemq.jaas.GroupPrincipal");
         entry.setQueue(">");
+        try {
         	entry.setRead("admins");
-        entries.add(entry);
+        } catch (Exception e) {
+        	fail(e.toString());
+        }
         
+        
+        entries.add(entry);
+        // entry using default org.apache.activemq.jaas.GroupPrincipal class  
         entry = new AuthorizationEntry();
         entry.setQueue("USERS.>");
+        try {
         	entry.setRead("users");
+        } catch (Exception e) {
+        	fail(e.toString());
+        }
         entries.add(entry);
 
         answer.setAuthorizationEntries(entries);
@@ -86,19 +97,31 @@ public class AuthorizationMapTest extends TestCase {
 
         AuthorizationEntry entry = new AuthorizationEntry();
         entry.setQueue(">");
+        try {
         	entry.setRead("admins");
+        } catch (Exception e) {
+        	fail(e.toString());
+        }
         entries.add(entry);
 
         entry = new AuthorizationEntry();
         entry.setQueue("USERS.>");
+        try {
         	entry.setRead("users");
+        } catch (Exception e) {
+        	fail(e.toString());
+        }
         entries.add(entry);
 
         answer.setAuthorizationEntries(entries);
         
         //create entry for temporary queue
         TempDestinationAuthorizationEntry tEntry = new TempDestinationAuthorizationEntry();
+        try {
         	tEntry.setAdmin("tempDestAdmins");
+        } catch (Exception e) {
+        	fail(e.toString());
+        }        
         
         answer.setTempDestinationAuthorizationEntry(tEntry);