[jboss-cvs] JBossAS SVN: r64001 - branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2.

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

Author: dimitris at jboss.org
Date: 2007-07-12 13:51:38 -0400 (Thu, 12 Jul 2007)
New Revision: 64001

Modified:
   branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java
Log:
JBAS-4541, Authentication Service (AS) Context stored in CSIv2 encoded IORs shouldn't indicate EstablishTrustInClient supported when AUTH_METHOD_NONE

Modified: branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java	2007-07-12 17:35:45 UTC (rev 64000)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java	2007-07-12 17:51:38 UTC (rev 64001)
@@ -21,24 +21,24 @@
  */
 package org.jboss.iiop.csiv2;
 
-import java.net.InetAddress;
 import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
 
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.Oid;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.IorSecurityConfigMetaData;
+import org.jboss.metadata.IorSecurityConfigMetaData.AsContext;
+import org.jboss.metadata.IorSecurityConfigMetaData.SasContext;
+import org.jboss.metadata.IorSecurityConfigMetaData.TransportConfig;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.ORB;
-
-import org.omg.IOP.Codec;
-import org.omg.IOP.CodecPackage.InvalidTypeForEncoding;
-import org.omg.IOP.TaggedComponent;
-
-import org.omg.CSI.ITTAbsent;
 import org.omg.CSI.ITTAnonymous;
+import org.omg.CSI.ITTDistinguishedName;
 import org.omg.CSI.ITTPrincipalName;
 import org.omg.CSI.ITTX509CertChain;
-import org.omg.CSI.ITTDistinguishedName;
-
 import org.omg.CSIIOP.AS_ContextSec;
 import org.omg.CSIIOP.CompoundSecMech;
 import org.omg.CSIIOP.CompoundSecMechList;
@@ -58,27 +58,17 @@
 import org.omg.CSIIOP.TLS_SEC_TRANS;
 import org.omg.CSIIOP.TLS_SEC_TRANSHelper;
 import org.omg.CSIIOP.TransportAddress;
-
 import org.omg.GSSUP.GSSUPMechOID;
 import org.omg.GSSUP.InitialContextToken;
 import org.omg.GSSUP.InitialContextTokenHelper;
-
+import org.omg.IOP.Codec;
+import org.omg.IOP.TaggedComponent;
+import org.omg.IOP.CodecPackage.InvalidTypeForEncoding;
 import org.omg.PortableInterceptor.ClientRequestInfo;
-
 import org.omg.SSLIOP.SSL;
 import org.omg.SSLIOP.SSLHelper;
 import org.omg.SSLIOP.TAG_SSL_SEC_TRANS;
 
-import org.ietf.jgss.GSSException;
-import org.ietf.jgss.Oid;
-
-import org.jboss.metadata.IorSecurityConfigMetaData;
-import org.jboss.metadata.IorSecurityConfigMetaData.TransportConfig;
-import org.jboss.metadata.IorSecurityConfigMetaData.AsContext;
-import org.jboss.metadata.IorSecurityConfigMetaData.SasContext;
-
-import org.jboss.logging.Logger;
-
 /**
  * Helper class
  *
@@ -325,7 +315,7 @@
       AS_ContextSec context = null;
       
       // the content of the context
-      int support = EstablishTrustInClient.value; // per default support this
+      int support = 0;
       int require = 0;
       byte[] clientAuthMech = {};
       byte[] targetName = {};
@@ -336,11 +326,8 @@
       // if no AS context metatada exists, or authentication method
       // "none" is specified, we can produce an empty AS context
       if( asMeta == null || asMeta.getAuthMethod().equals(AsContext.AUTH_METHOD_NONE)
-         || asMeta.isRequired() == false )
+         /*|| asMeta.isRequired() == false*/ )
       {
-         // TODO: check if an empty AS context may contain a target name.
-         targetName = encodeGssExportedName(targetName);
-         
          context = new AS_ContextSec((short) support,
             (short) require,
             clientAuthMech,
@@ -348,6 +335,9 @@
       }
       else
       {
+         // we do support
+         support = EstablishTrustInClient.value;
+         
          // required depends on the metadata
          if( asMeta.isRequired() )
             require = EstablishTrustInClient.value;