[openejb-scm] openejb/modules/core/src/java/org/openejb/security SecurityConfiguration.java EJBSecurityInterceptor.java

[maguro]

maguro      2004/07/26 22:28:52

  Modified:    modules/core/src/java/org/openejb/security
                        EJBSecurityInterceptor.java
  Added:       modules/core/src/java/org/openejb/security
                        SecurityConfiguration.java
  Log:

  Intermediate check-in of security deployment code, before I loose the work.
  
  Revision  Changes    Path
  1.3       +3 -1      
openejb/modules/core/src/java/org/openejb/security/EJBSecurityInterceptor.java
  
  Index: EJBSecurityInterceptor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/security/EJBSecurityInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EJBSecurityInterceptor.java       21 Mar 2004 21:26:36 -0000      1.2
  +++ EJBSecurityInterceptor.java       27 Jul 2004 02:28:52 -0000      1.3
  @@ -83,6 +83,7 @@
           EJBInvocation ejbInvocation = ((EJBInvocation) invocation);
   
           Subject subject = ContextManager.getCurrentCaller();
  +        String oldPolicyContextID = PolicyContext.getContextID();
           try {
               ContextManager.setCurrentCaller(ContextManager.getNextCaller());
               // @todo should setContainerId take an object?
  @@ -101,6 +102,7 @@
                   throw new AccessException(e.getMessage());
               }
           } finally {
  +            PolicyContext.setContextID(oldPolicyContextID);
               ContextManager.setCurrentCaller(subject);
           }
       }
  
  
  
  1.1                  
openejb/modules/core/src/java/org/openejb/security/SecurityConfiguration.java
  
  Index: SecurityConfiguration.java
  ===================================================================
  /* ====================================================================
   * Redistribution and use of this software and associated documentation
   * ("Software"), with or without modification, are permitted provided
   * that the following conditions are met:
   *
   * 1. Redistributions of source code must retain copyright
   *    statements and notices.  Redistributions must also contain a
   *    copy of this document.
   *
   * 2. Redistributions in binary form must reproduce this list of
   *    conditions and the following disclaimer in the documentation
   *    and/or other materials provided with the distribution.
   *
   * 3. The name "OpenEJB" must not be used to endorse or promote
   *    products derived from this Software without prior written
   *    permission of The OpenEJB Group.  For written permission,
   *    please contact [EMAIL PROTECTED]
   *
   * 4. Products derived from this Software may not be called "OpenEJB"
   *    nor may "OpenEJB" appear in their names without prior written
   *    permission of The OpenEJB Group. OpenEJB is a registered
   *    trademark of The OpenEJB Group.
   *
   * 5. Due credit should be given to the OpenEJB Project
   *    (http://openejb.org/).
   *
   * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
   * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
   * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
   * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
   * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
   * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
   * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the OpenEJB Project.  For more information
   * please see <http://openejb.org/>.
   *
   * ====================================================================
   */
  
  package org.openejb.security;
  
  import java.io.Serializable;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Map;
  import java.util.Set;
  import java.security.Permissions;
  
  
  /**
   * @version $Revision: 1.1 $ $Date: 2004/07/27 02:28:52 $
   */
  public class SecurityConfiguration implements Serializable {
  
      private String policyContextId;
      private Permissions excludedPolicy = new Permissions();
      private Permissions uncheckedPolicy = new Permissions();
      private Map rolePolicies = new HashMap();
      private Map roleReferences = new HashMap();
  
      public String getPolicyContextId() {
          return policyContextId;
      }
  
      public void setPolicyContextId(String policyContextId) {
          this.policyContextId = policyContextId;
      }
  
      public Permissions getExcludedPolicy() {
          return excludedPolicy;
      }
  
      public Permissions getUncheckedPolicy() {
          return uncheckedPolicy;
      }
  
      public Map getRolePolicies() {
          return rolePolicies;
      }
  
      public Map getRoleReferences() {
          return roleReferences;
      }
  }