[jboss-cvs] JBossAS SVN: r68741 - projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization.

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

Author: anil.saldhana at jboss.com
Date: 2008-01-09 15:02:09 -0500 (Wed, 09 Jan 2008)
New Revision: 68741

Modified:
   projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java
   projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java
Log:
SECURITY-107: weave in identity stuff

Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java	2008-01-09 20:01:49 UTC (rev 68740)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java	2008-01-09 20:02:09 UTC (rev 68741)
@@ -24,11 +24,13 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map; 
+import java.util.Map;
+
 import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler; 
+import javax.security.auth.callback.CallbackHandler;
 
 import org.jboss.security.config.ControlFlag;
+import org.jboss.security.identity.RoleGroup;
  
 
 //$Id: AuthorizationContext.java 62954 2007-05-10 04:12:18Z anil.saldhana at jboss.com $
@@ -53,9 +55,14 @@
 {   
    protected String securityDomainName = null;
    protected CallbackHandler callbackHandler = null;
-   protected Subject authenticatedSubject = null;
+   //protected Subject authenticatedSubject = null;
    protected Map<String,Object> sharedState = new HashMap<String,Object>(); 
    
+   /**
+    * Roles of the Subject
+    */
+  // protected Role subjectRoles = null;
+   
    protected List<AuthorizationModule> modules = new ArrayList<AuthorizationModule>();
    
    /**
@@ -67,10 +74,31 @@
    public static final int DENY = -1;  
    
    /**
-    * Authorize the Resource
+    * Authorize the Resource 
     * @param resource
     * @return AuthorizationContext.PERMIT or AuthorizationContext.DENY
     * @throws AuthorizationException
     */
-   public abstract int authorize(final Resource resource) throws AuthorizationException;  
+   public abstract int authorize(final Resource resource) throws AuthorizationException;
+   
+   /**
+    * Authorize the resource
+    * @param resource
+    * @param subject Subject of the caller
+    * @param roles Roles of the caller
+    * @return
+    * @throws AuthorizationException
+    */
+   public abstract int authorize(final Resource resource, final Subject subject,
+         final RoleGroup roles)
+   throws AuthorizationException;
+
+   /**
+    * Return the Security Domain Name
+    * @return security domain
+    */
+   public String getSecurityDomain()
+   {
+     return this.securityDomainName;   
+   }
 }
\ No newline at end of file

Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java	2008-01-09 20:01:49 UTC (rev 68740)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java	2008-01-09 20:02:09 UTC (rev 68741)
@@ -26,6 +26,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
 
+import org.jboss.security.identity.RoleGroup;
+
 //$Id: AuthorizationModule.java 45685 2006-06-20 04:46:23Z asaldhana $
 
 /**
@@ -59,9 +61,10 @@
     * @param sharedState state shared with other configured modules 
     * @param options options specified in the Configuration 
     *                for this particular module
+    * @param roles Roles of the subject               
     */
    void initialize(Subject subject, CallbackHandler handler,
-         Map<String,Object> sharedState, Map<String,Object> options);
+         Map<String,Object> sharedState, Map<String,Object> options, RoleGroup roles);
    
    /**
     * Authorize the resource