[Jboss-cvs] JBossAS SVN: r56119 - 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:37:05 -0400 (Mon, 21 Aug 2006)
New Revision: 56119

Modified:
   trunk/security/src/main/org/jboss/security/plugins/SecurityDomainContext.java
Log:
JBAS-3535: AuthorizationManager from JNDI

Modified: trunk/security/src/main/org/jboss/security/plugins/SecurityDomainContext.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/SecurityDomainContext.java	2006-08-21 16:35:44 UTC (rev 56118)
+++ trunk/security/src/main/org/jboss/security/plugins/SecurityDomainContext.java	2006-08-21 16:37:05 UTC (rev 56119)
@@ -25,6 +25,7 @@
 import javax.naming.NamingException;
 import javax.security.auth.Subject;
 
+import org.jboss.security.AuthorizationManager;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.SubjectSecurityManager;
@@ -33,23 +34,28 @@
 /** An encapsulation of the JNDI security context infomation
  *
  * @author  Scott.Stark at jboss.org
+ * @author  Anil.Saldhana at jboss.org
  * @version 
  */
 public class SecurityDomainContext
 {
    static final String ACTIVE_SUBJECT = "subject";
    static final String AUTHENTICATION_MGR = "securityMgr";
-   static final String AUTORIZATION_MGR = "realmMapping";
+   static final String REALM_MAPPING = "realmMapping";
+   static final String AUTHORIZATION_MGR = "authorizationMgr";
    static final String AUTH_CACHE = "authenticationCache";
+   static final String DOMAIN_CONTEXT = "domainContext";
 
    AuthenticationManager securityMgr;
+   AuthorizationManager authorizationMgr;
    CachePolicy authenticationCache;
 
    /** Creates new SecurityDomainContextHandler */
-   public SecurityDomainContext(AuthenticationManager securityMgr, CachePolicy authenticationCache)
+   public SecurityDomainContext(AuthenticationManager securityMgr, 
+         CachePolicy authenticationCache)
    {
       this.securityMgr = securityMgr;
-      this.authenticationCache = authenticationCache;
+      this.authenticationCache = authenticationCache; 
    }
 
    public Object lookup(String name) throws NamingException
@@ -62,10 +68,15 @@
          binding = getSubject();
       else if( name.equals(AUTHENTICATION_MGR) )
          binding = securityMgr;
-      else if( name.equals(AUTORIZATION_MGR) )
+      else if( name.equals(REALM_MAPPING) )
          binding = getRealmMapping();
+      else if( name.equals(AUTHORIZATION_MGR) )
+         binding = getAuthorizationManager();
       else if( name.equals(AUTH_CACHE) )
          binding = authenticationCache;
+      else if( name.equals(DOMAIN_CONTEXT) )
+         binding = this;
+         
       return binding;
    }
    public Subject getSubject()
@@ -84,15 +95,30 @@
    public RealmMapping getRealmMapping()
    {
       RealmMapping realmMapping = null;
+      if(authorizationMgr != null && authorizationMgr instanceof RealmMapping)
+      {
+         realmMapping = (RealmMapping)authorizationMgr;
+      }
+      else
       if( securityMgr instanceof RealmMapping )
       {
          realmMapping = (RealmMapping)securityMgr;
       }
       return realmMapping;
    }
+   
+   public void setAuthorizationManager(AuthorizationManager am)
+   {
+      this.authorizationMgr = am;
+   }
+   
+   public AuthorizationManager getAuthorizationManager()
+   {
+      return authorizationMgr;
+   }
+   
    public CachePolicy getAuthenticationCache()
    {
       return authenticationCache;
-   }
-
+   } 
 }