[Jboss-cvs] JBossAS SVN: r56354 - in trunk/security/src/main/org/jboss/security: . authorization

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

Author: anil.saldhana at jboss.com
Date: 2006-08-28 16:48:16 -0400 (Mon, 28 Aug 2006)
New Revision: 56354

Modified:
   trunk/security/src/main/org/jboss/security/Util.java
   trunk/security/src/main/org/jboss/security/authorization/AuthorizationContext.java
Log:
Use Util methods

Modified: trunk/security/src/main/org/jboss/security/Util.java
===================================================================
--- trunk/security/src/main/org/jboss/security/Util.java	2006-08-28 20:47:07 UTC (rev 56353)
+++ trunk/security/src/main/org/jboss/security/Util.java	2006-08-28 20:48:16 UTC (rev 56354)
@@ -30,20 +30,26 @@
 import java.security.KeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
 import java.security.Provider;
 import java.security.Security;
 import java.security.SecureRandom;
 import java.security.acl.Group;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
 import javax.naming.InitialContext;
 import javax.security.auth.Subject;
 
 import org.jboss.crypto.JBossSXProvider;
 import org.jboss.crypto.digest.DigestCallback;
 import org.jboss.logging.Logger;
+import org.jboss.security.config.ApplicationPolicy;
 
 /** Various security related utilities like MessageDigest
  factories, SecureRandom access, password hashing.
@@ -638,7 +644,33 @@
             roles = grp;
       }
       return roles;
-   }
+   } 
+
+   /**
+    * Obtain the Application Policy
+    * 
+    * @param domainName Security Domain 
+    * @param mbeanServer MBeanServer
+    * @return
+    */
+   public static ApplicationPolicy getApplicationPolicy(String domainName, 
+         ObjectName oname, MBeanServer mbeanServer)
+   {
+      ApplicationPolicy aPolicy = null;
+      try
+      {
+         aPolicy = (ApplicationPolicy)mbeanServer.invoke(oname,
+               "getApplicationPolicy", 
+               new Object[]{domainName},
+               new String[]{"java.lang.String"});
+      }
+      catch (JMException jme)
+      { 
+         throw new IllegalStateException("Cannot obtain Application Policy::" + 
+                         jme.getLocalizedMessage());
+      } 
+      return aPolicy;
+   } 
    
    /**
     * Do a JNDI lookup to obtain the authorization manager

Modified: trunk/security/src/main/org/jboss/security/authorization/AuthorizationContext.java
===================================================================
--- trunk/security/src/main/org/jboss/security/authorization/AuthorizationContext.java	2006-08-28 20:47:07 UTC (rev 56353)
+++ trunk/security/src/main/org/jboss/security/authorization/AuthorizationContext.java	2006-08-28 20:48:16 UTC (rev 56354)
@@ -37,6 +37,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.security.SecurityConstants;
+import org.jboss.security.Util;
 import org.jboss.security.authorization.config.AuthorizationModuleEntry;
 import org.jboss.security.authorization.config.AuthorizationModuleEntry.ControlFlag;
 import org.jboss.security.config.ApplicationPolicy;
@@ -330,47 +331,23 @@
          throw new IllegalStateException("MBean Server not located");
       if(this.securityConfigService == null)
          throw new IllegalStateException("Security Config Service not injected");
-      ApplicationPolicy aPolicy = getApplicationPolicy(domainName, mbeanServer);  
+      ApplicationPolicy aPolicy = Util.getApplicationPolicy(domainName, 
+            this.securityConfigService, mbeanServer);  
       if(aPolicy == null)
       {
          if(trace)
             log.trace("Application Policy not obtained for domain="+ domainName +
                          ". Trying to obtain the App policy for the default domain of the layer:");
          if(Resource.EJB.equals(layer))
-            aPolicy = getApplicationPolicy(SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY,mbeanServer);
+            aPolicy = Util.getApplicationPolicy(SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY,
+                  this.securityConfigService,mbeanServer);
          else
             if(Resource.WEB.equals(layer))
-               aPolicy = getApplicationPolicy(SecurityConstants.DEFAULT_WEB_APPLICATION_POLICY,mbeanServer);
+               aPolicy = Util.getApplicationPolicy(SecurityConstants.DEFAULT_WEB_APPLICATION_POLICY,
+                     this.securityConfigService, mbeanServer);
       }
       if(aPolicy == null)
          throw new IllegalStateException("Application Policy is null for domain:"+ domainName);
       return aPolicy.getAuthorizationInfo();
-   }
-
-   /**
-    * Obtain the Application Policy
-    * 
-    * @param domainName Security Domain 
-    * @param mbeanServer MBeanServer
-    * @return
-    */
-   private ApplicationPolicy getApplicationPolicy(String domainName, MBeanServer mbeanServer)
-   {
-      ApplicationPolicy aPolicy = null;
-      try
-      {
-         aPolicy = (ApplicationPolicy)mbeanServer.invoke(this.securityConfigService,
-               "getApplicationPolicy", 
-               new Object[]{domainName},
-               new String[]{"java.lang.String"});
-      }
-      catch (JMException jme)
-      { 
-         throw new IllegalStateException("Cannot obtain Application Policy::" + 
-                         jme.getLocalizedMessage());
-      }
-      if(trace)
-         log.trace("Application Policy for domain=" + domainName + " ::" + aPolicy);
-      return aPolicy;
    } 
 }