[jboss-cvs] jbosssx/src/main/org/jboss/security/authorization/modules/ejb ...

Anil Saldhana anil.saldhana at jboss.com
Tue Jul 25 23:35:54 EDT 2006


  User: asaldhana
  Date: 06/07/25 23:35:54

  Modified:    src/main/org/jboss/security/authorization/modules/ejb    
                        EJBJACCPolicyModuleDelegate.java
                        EJBPolicyModuleDelegate.java
  Added:       src/main/org/jboss/security/authorization/modules/ejb    
                        EJBXACMLPolicyModuleDelegate.java
  Removed:     src/main/org/jboss/security/authorization/modules/ejb    
                        EJBXACMLPolicyModuleHelper.java
  Log:
  JBAS-3324: Be consistent in naming of delegates
  
  Revision  Changes    Path
  1.3       +6 -6      jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EJBJACCPolicyModuleDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EJBJACCPolicyModuleDelegate.java	25 Jul 2006 16:59:40 -0000	1.2
  +++ EJBJACCPolicyModuleDelegate.java	26 Jul 2006 03:35:54 -0000	1.3
  @@ -38,19 +38,19 @@
   import org.jboss.security.authorization.PolicyRegistration;
   import org.jboss.security.authorization.Resource;
   import org.jboss.security.authorization.ResourceKeys;
  -import org.jboss.security.authorization.modules.AuthorizationModuleHelper;
  +import org.jboss.security.authorization.modules.AuthorizationModuleDelegate;
    
   
  -//$Id: EJBJACCPolicyModuleDelegate.java,v 1.2 2006/07/25 16:59:40 asaldhana Exp $
  +//$Id: EJBJACCPolicyModuleDelegate.java,v 1.3 2006/07/26 03:35:54 asaldhana Exp $
   
   /**
    *  Authorization Module delegate that deals with the authorization decisions
    *  for the EJB Layer
    *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    *  @since  Jul 6, 2006 
  - *  @version $Revision: 1.2 $
  + *  @version $Revision: 1.3 $
    */
  -public class EJBJACCPolicyModuleDelegate extends AuthorizationModuleHelper
  +public class EJBJACCPolicyModuleDelegate extends AuthorizationModuleDelegate
   {  
      private String ejbName = null;
      private Method ejbMethod = null; 
  @@ -67,7 +67,7 @@
      }
      
      /**
  -    * @see AuthorizationModuleHelper#authorize(Resource)
  +    * @see AuthorizationModuleDelegate#authorize(Resource)
       */
      public int authorize(Resource resource)
      {
  @@ -96,7 +96,7 @@
      }
   
      /**
  -    * @see AuthorizationModuleHelper#setPolicyRegistrationManager(PolicyRegistration)
  +    * @see AuthorizationModuleDelegate#setPolicyRegistrationManager(PolicyRegistration)
       */
      public void setPolicyRegistrationManager(PolicyRegistration authzM)
      {  
  
  
  
  1.2       +5 -5      jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EJBPolicyModuleDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EJBPolicyModuleDelegate.java	25 Jul 2006 17:11:54 -0000	1.1
  +++ EJBPolicyModuleDelegate.java	26 Jul 2006 03:35:54 -0000	1.2
  @@ -38,19 +38,19 @@
   import org.jboss.security.authorization.PolicyRegistration;
   import org.jboss.security.authorization.Resource;
   import org.jboss.security.authorization.ResourceKeys;
  -import org.jboss.security.authorization.modules.AuthorizationModuleHelper;
  +import org.jboss.security.authorization.modules.AuthorizationModuleDelegate;
    
   
  -//$Id: EJBPolicyModuleDelegate.java,v 1.1 2006/07/25 17:11:54 asaldhana Exp $
  +//$Id: EJBPolicyModuleDelegate.java,v 1.2 2006/07/26 03:35:54 asaldhana Exp $
   
   /**
    *  Authorization Module delegate that deals with the authorization decisions
    *  for the EJB Layer (Default Behavior)
    *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    *  @since  Jul 6, 2006 
  - *  @version $Revision: 1.1 $
  + *  @version $Revision: 1.2 $
    */
  -public class EJBPolicyModuleDelegate extends AuthorizationModuleHelper
  +public class EJBPolicyModuleDelegate extends AuthorizationModuleDelegate
   {  
      private String ejbName = null;
      private Method ejbMethod = null; 
  @@ -69,7 +69,7 @@
      }
      
      /**
  -    * @see AuthorizationModuleHelper#authorize(Resource)
  +    * @see AuthorizationModuleDelegate#authorize(Resource)
       */
      public int authorize(Resource resource)
      {
  @@ -101,7 +101,7 @@
      }
   
      /**
  -    * @see AuthorizationModuleHelper#setPolicyRegistrationManager(PolicyRegistration)
  +    * @see AuthorizationModuleDelegate#setPolicyRegistrationManager(PolicyRegistration)
       */
      public void setPolicyRegistrationManager(PolicyRegistration authzM)
      {  
  
  
  
  1.1      date: 2006/07/26 03:35:54;  author: asaldhana;  state: Exp;jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java
  
  Index: EJBXACMLPolicyModuleDelegate.java
  ===================================================================
  /*
    * JBoss, Home of Professional Open Source
    * Copyright 2005, JBoss Inc., and individual contributors as indicated
    * by the @authors tag. See the copyright.txt in the distribution for a
    * full listing of individual contributors.
    *
    * This is free software; you can redistribute it and/or modify it
    * under the terms of the GNU Lesser General Public License as
    * published by the Free Software Foundation; either version 2.1 of
    * the License, or (at your option) any later version.
    *
    * This software is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this software; if not, write to the Free
    * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
    * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
    */
  package org.jboss.security.authorization.modules.ejb;
  
  import java.lang.reflect.Method;
  import java.security.Principal;
  import java.util.Map;
  
  import javax.security.jacc.PolicyContext; 
  import org.jboss.logging.Logger; 
  import org.jboss.security.authorization.AuthorizationContext;
  import org.jboss.security.authorization.PolicyRegistration;
  import org.jboss.security.authorization.Resource; 
  import org.jboss.security.authorization.modules.AuthorizationModuleDelegate;
  import org.jboss.security.authorization.sunxacml.JBossXACMLUtil; 
  
  import com.sun.xacml.Policy;
  import com.sun.xacml.ctx.RequestCtx;
  
  //$Id: EJBXACMLPolicyModuleDelegate.java,v 1.1 2006/07/26 03:35:54 asaldhana Exp $
  
  /**
   *  Authorization Module Delegate that deals with the authorization decisions
   *  for the EJB Layer
   *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
   *  @since  Jul 6, 2006 
   *  @version $Revision: 1.1 $
   */
  public class EJBXACMLPolicyModuleDelegate extends AuthorizationModuleDelegate
  {   
     private String ejbName = null;
     private Method ejbMethod = null;
     private Principal principal = null;
     
     public EJBXACMLPolicyModuleDelegate()
     {
       log = Logger.getLogger(getClass());
       trace = log.isTraceEnabled();
     }
     
     /**
      * @see AuthorizationModuleDelegate#authorize(Resource)
      */
     public int authorize(Resource resource)
     {
        //Get the contextual map
        Map map = resource.getMap();
        if(map == null)
           throw new IllegalStateException("Map from the Resource is null");
      
        if(map.size() == 0)
           throw new IllegalStateException("Map from the Resource is size zero"); 
        PolicyRegistration pr = (PolicyRegistration)map.get("authorizationManager");
        if(pr != null)
          this.authzManager = pr;
        //Populate local variables from the resource
        this.ejbName = (String)map.get("ejb.name");
        this.ejbMethod = (Method)map.get("ejb.method"); 
        this.principal = (Principal)map.get("ejb.principal");
        return process();
     }
  
     /**
      * @see AuthorizationModuleDelegate#setPolicyRegistrationManager(PolicyRegistration)
      */
     public void setPolicyRegistrationManager(PolicyRegistration authzM)
     {  
        this.authzManager =  authzM;
     }
     
     //Private Methods
     /**
      * Process the web request
      * @param request
      * @param sc
      * @return
      */
     private int process() 
     { 
        int result = AuthorizationContext.DENY;
        EJBXACMLUtil util = new EJBXACMLUtil();
        try
        {
           RequestCtx requestCtx = util.createXACMLRequest(this.ejbName,
                 this.ejbMethod.getName(),this.principal, this.authzManager);
           String contextID = PolicyContext.getContextID();
           Policy policy = (Policy)authzManager.getPolicy(contextID,null);
           if(policy == null)
           {
              if(trace)
                 log.trace("Policy obtained is null for contextID:"+contextID);
              throw new IllegalStateException("Missing xacml policy for contextid:"+contextID);
           }
           result = JBossXACMLUtil.checkXACMLAuthorization(requestCtx,policy);
        }
        catch(Exception e)
        {
           if(trace)
              log.trace("Exception in processing:",e);
           result = AuthorizationContext.DENY;
        }  
        return result;
     } 
  }
  
  
  



More information about the jboss-cvs-commits mailing list