[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/security/config/css CSSCompoundSecMechConfig.java CSSSASMechConfig.java

[maguro]

maguro      2005/04/01 20:08:41

  Modified:    modules/core/src/java/org/openejb/corba/security/config/css
                        CSSCompoundSecMechConfig.java CSSSASMechConfig.java
  Log:

  Added SAS identity assertions.
  
  Fixed some SSL configuration problems.
  
  Revision  Changes    Path
  1.5       +15 -1     
openejb/modules/core/src/java/org/openejb/corba/security/config/css/CSSCompoundSecMechConfig.java
  
  Index: CSSCompoundSecMechConfig.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/css/CSSCompoundSecMechConfig.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSSCompoundSecMechConfig.java     31 Mar 2005 15:25:07 -0000      1.4
  +++ CSSCompoundSecMechConfig.java     2 Apr 2005 01:08:41 -0000       1.5
  @@ -49,6 +49,8 @@
   
   import java.io.Serializable;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.omg.CORBA.Any;
   import org.omg.CORBA.UserException;
   import org.omg.CSI.EstablishContext;
  @@ -58,6 +60,7 @@
   import org.omg.IOP.ServiceContext;
   
   import org.openejb.corba.security.config.tss.TSSCompoundSecMechConfig;
  +import org.openejb.corba.security.config.ConfigUtil;
   import org.openejb.corba.util.Util;
   
   
  @@ -66,6 +69,8 @@
    */
   public class CSSCompoundSecMechConfig implements Serializable {
   
  +    private final static Log log = 
LogFactory.getLog(CSSCompoundSecMechConfig.class);
  +
       private short supports;
       private short requires;
       private CSSTransportMechConfig transport_mech;
  @@ -103,6 +108,15 @@
       }
   
       public boolean canHandle(TSSCompoundSecMechConfig requirement) {
  +
  +        if (log.isDebugEnabled()) {
  +            log.debug("canHandle()");
  +            log.debug("    CSS SUPPORTS: " + ConfigUtil.flags(supports));
  +            log.debug("    CSS REQUIRES: " + ConfigUtil.flags(requires));
  +            log.debug("    TSS SUPPORTS: " + 
ConfigUtil.flags(requirement.getSupports()));
  +            log.debug("    TSS REQUIRES: " + 
ConfigUtil.flags(requirement.getRequires()));
  +        }
  +
           if ((supports & requirement.getRequires()) != 
requirement.getRequires()) return false;
           if ((requires & requirement.getSupports()) != requires) return false;
   
  
  
  
  1.5       +10 -49    
openejb/modules/core/src/java/org/openejb/corba/security/config/css/CSSSASMechConfig.java
  
  Index: CSSSASMechConfig.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/css/CSSSASMechConfig.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSSSASMechConfig.java     31 Mar 2005 15:25:08 -0000      1.4
  +++ CSSSASMechConfig.java     2 Apr 2005 01:08:41 -0000       1.5
  @@ -69,50 +69,9 @@
       private short supports;
       private short requires;
       private boolean required;
  -    private final ArrayList privilegeAuthorities = new ArrayList();
  -    private final ArrayList namingMechanisms = new ArrayList();
  -    private int identityTypes = ITTAbsent.value;
  +    private CSSSASIdentityToken identityToken;
   
   
  -    public void addServiceConfigurationConfig(TSSServiceConfigurationConfig 
config) {
  -        privilegeAuthorities.add(config);
  -
  -        supports |= DelegationByClient.value;
  -        if (required) requires = DelegationByClient.value;
  -    }
  -
  -    public TSSServiceConfigurationConfig serviceConfigurationAt(int i) {
  -        return (TSSServiceConfigurationConfig) privilegeAuthorities.get(i);
  -    }
  -
  -    public int paSize() {
  -        return privilegeAuthorities.size();
  -    }
  -
  -    public void addnamingMechanism(String mech) {
  -        namingMechanisms.add(mech);
  -
  -        identityTypes |= ITTPrincipalName.value;
  -        supports |= IdentityAssertion.value;
  -    }
  -
  -    public String namingMechanismAt(int i) {
  -        return (String) namingMechanisms.get(i);
  -    }
  -
  -    public int nmSize() {
  -        return namingMechanisms.size();
  -    }
  -
  -    public int getIdentityTypes() {
  -        return identityTypes;
  -    }
  -
  -    public void setIdentityTypes(int identityTypes) {
  -        this.identityTypes = identityTypes;
  -        if (identityTypes != 0) supports |= IdentityAssertion.value;
  -    }
  -
       public short getSupports() {
           return supports;
       }
  @@ -127,8 +86,14 @@
   
       public void setRequired(boolean required) {
           this.required = required;
  +    }
  +
  +    public CSSSASIdentityToken getIdentityToken() {
  +        return identityToken;
  +    }
   
  -        if (required) requires = (short) (supports & 
DelegationByClient.value);
  +    public void setIdentityToken(CSSSASIdentityToken identityToken) {
  +        this.identityToken = identityToken;
       }
   
       public boolean canHandle(TSSSASMechConfig sasMech) {
  @@ -145,10 +110,6 @@
       }
   
       public IdentityToken encodeIdentityToken() {
  -        IdentityToken token = new IdentityToken();
  -
  -        token.anonymous(true);
  -
  -        return token;
  +        return identityToken.encodeIdentityToken();
       }
   }