[Jboss-cvs] JBossAS SVN: r56121 - trunk/security/src/main/org/jboss/security/plugins

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2006-08-21 12:41:32 -0400 (Mon, 21 Aug 2006)
New Revision: 56121

Modified:
   trunk/security/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
JBAS-3535: use the util method to derive the roles

Modified: trunk/security/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2006-08-21 16:40:09 UTC (rev 56120)
+++ trunk/security/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2006-08-21 16:41:32 UTC (rev 56121)
@@ -41,7 +41,8 @@
 import org.jboss.logging.Logger;
 import org.jboss.security.AnybodyPrincipal;
 import org.jboss.security.AuthorizationManager;
-import org.jboss.security.NobodyPrincipal; 
+import org.jboss.security.NobodyPrincipal;  
+import org.jboss.security.Util;
 import org.jboss.security.authorization.AuthorizationContext;
 import org.jboss.security.authorization.AuthorizationException;
 import org.jboss.security.authorization.Resource;
@@ -316,29 +317,11 @@
     principal has been assigned.
     */
    public Set getUserRoles(Principal principal)
-   {
-      HashSet userRoles = null;
-      // Check that the caller is authenticated to the current thread
-      Subject subject = SubjectActions.getActiveSubject();
-      if( subject != null )
-      {
-         // Copy the caller's roles
-         if( trace )
-            log.trace("getUserRoles, subject: "+subject);
-         
-         Group roles = getSubjectRoles(subject);
-         if( roles != null )
-         {
-            userRoles = new HashSet();
-            Enumeration members = roles.members();
-            while( members.hasMoreElements() )
-            {
-               Principal role = (Principal) members.nextElement();
-               userRoles.add(role);
-            }
-         }
-      }
-      return userRoles;
+   { 
+      //Fallback on the subject roles
+      //Check that the caller is authenticated to the current thread
+      Subject subject = SubjectActions.getActiveSubject(); 
+      return this.getRolesAsSet(Util.getSubjectRoles(subject)); 
    }
    
    /**
@@ -600,5 +583,22 @@
    public String getSecurityDomain()
    {
       return this.securityDomain;
-   } 
+   }  
+
+   //Private Methods
+   private HashSet getRolesAsSet(Group roles)
+   {
+      HashSet userRoles = null;
+      if( roles != null )
+      {
+         userRoles = new HashSet();
+         Enumeration members = roles.members();
+         while( members.hasMoreElements() )
+         {
+            Principal role = (Principal) members.nextElement();
+            userRoles.add(role);
+         }
+      }
+      return userRoles;
+   }
 }