[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbEnterpriseContext.java

[jBoss CVS Development]

  User: oleg    
  Date: 00/11/02 07:56:05

  Modified:    src/main/org/jboss/ejb EnterpriseContext.java
  Log:
  isCallerInRole() implementation by Dan O'Connor is back
  getCallerPrincipal() now substitutes "principal for beans" obtained from
  RealmMapping  in place of the "original principal" obtained from client.
  
  Revision  Changes    Path
  1.19      +24 -12    jboss/src/main/org/jboss/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- EnterpriseContext.java    2000/10/20 03:11:41     1.18
  +++ EnterpriseContext.java    2000/11/02 15:56:04     1.19
  @@ -11,6 +11,7 @@
   import java.security.Identity;
   import java.security.Principal;
   import java.util.Properties;
  +import java.util.HashSet;
   
   import javax.ejb.EJBHome;
   import javax.ejb.EJBContext;
  @@ -28,15 +29,15 @@
   import org.jboss.logging.Logger;
   
   /**
  - *   The EnterpriseContext is used to associate EJB instances with metadata about 
it.
  - *   
  - *   @see StatefulSessionEnterpriseContext
  - *   @see StatelessSessionEnterpriseContext
  - *   @see EntityEnterpriseContext
  - *   @author Rickard �berg ([EMAIL PROTECTED])
  + *  The EnterpriseContext is used to associate EJB instances with metadata about it.
  + *  
  + *  @see StatefulSessionEnterpriseContext
  + *  @see StatelessSessionEnterpriseContext
  + *  @see EntityEnterpriseContext
  + *  @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.18 $
  + *  @version $Revision: 1.19 $
    */
   public abstract class EnterpriseContext
   {
  @@ -57,6 +58,9 @@
      
      // The principal associated with the call
      Principal principal;
  +
  +   // The principal for the bean associated with the call
  +   Principal beanPrincipal;
       
       // Only StatelessSession beans have no Id, stateful and entity do
      Object id; 
  @@ -103,6 +107,7 @@
       public void setPrincipal(Principal principal) {
          
          this.principal = principal;
  +
       }
       
       public void lock() 
  @@ -111,7 +116,7 @@
          
          //new Exception().printStackTrace();
          
  -//DEBUG              Logger.debug("EnterpriseContext.lock() "+hashCode()+" 
"+locked);
  +//DEBUG     Logger.debug("EnterpriseContext.lock() "+hashCode()+" "+locked);
       }
       
       public void unlock() {
  @@ -122,7 +127,7 @@
          //new Exception().printStackTrace();
          if (locked <0) new Exception().printStackTrace();
          
  -//DEBUG              Logger.debug("EnterpriseContext.unlock() "+hashCode()+" 
"+locked);
  +//DEBUG     Logger.debug("EnterpriseContext.unlock() "+hashCode()+" "+locked);
       }
       
       public boolean isLocked() {
  @@ -169,7 +174,10 @@
         
         public Principal getCallerPrincipal() 
          { 
  -         return principal;
  +         if ( principal != null && beanPrincipal == null ) {
  +             beanPrincipal = con.getRealmMapping().getPrincipal( principal );
  +         }
  +         return beanPrincipal;
          }
         
         public EJBHome getEJBHome() 
  @@ -237,7 +245,11 @@
         // TODO - how to handle this best?
         public boolean isCallerInRole(String id) 
          { 
  -         return false; 
  +         if (principal == null)
  +            return false;
  +         HashSet set = new HashSet();
  +         set.add( id );
  +         return con.getRealmMapping().doesUserHaveRole( principal, set );
          }
      
         // TODO - how to handle this best?
  @@ -262,7 +274,7 @@
            con.getTransactionManager().begin();
           
           // keep track of the transaction in enterprise context for BMT
  -        setTransaction(con.getTransactionManager().getTransaction());               
  
  +        setTransaction(con.getTransactionManager().getTransaction());        
           
           
           // DEBUG Logger.debug("UserTransactionImpl.begin " + transaction.hashCode() 
+ " in UserTransactionImpl " + this.hashCode());