You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2010/04/14 22:06:52 UTC

svn commit: r934167 - /httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java

Author: olegk
Date: Wed Apr 14 20:06:52 2010
New Revision: 934167

URL: http://svn.apache.org/viewvc?rev=934167&view=rev
Log:
Minor code cleanups

Modified:
    httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java

Modified: httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java?rev=934167&r1=934166&r2=934167&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java Wed Apr 14 20:06:52 2010
@@ -44,26 +44,28 @@ import org.bouncycastle.asn1.util.ASN1Du
 
 /**
  * Takes Kerberos ticket and wraps into a SPNEGO token. Leaving some optional fields out.
- * Uses bouncycastle libs need a bcprov.jar
  */
 public class BouncySpnegoTokenGenerator implements SpnegoTokenGenerator {
-    private static final Log LOG = LogFactory.getLog(BouncySpnegoTokenGenerator.class);
+
+    private final Log log = LogFactory.getLog(getClass());
+
+    private final DERObjectIdentifier spnegoOid;
+    private final DERObjectIdentifier kerbOid;
     
-    private DERObjectIdentifier spnegoOid = new DERObjectIdentifier("1.3.6.1.5.5.2");
-    private DERObjectIdentifier kerbOid = new DERObjectIdentifier("1.2.840.113554.1.2.2");
+    public BouncySpnegoTokenGenerator() {
+        super();
+        this.spnegoOid = new DERObjectIdentifier("1.3.6.1.5.5.2");
+        this.kerbOid = new DERObjectIdentifier("1.2.840.113554.1.2.2");
+    }
 
     public byte [] generateSpnegoDERObject(byte [] kerbTicket) throws IOException {
-        LOG.debug("enter: generateSpnegoDERObject(byte [] kerbTicket)");
         DEROctetString ourKerberosTicket = new DEROctetString(kerbTicket);
         
         DERSequence kerbOidSeq = new DERSequence(kerbOid);
         DERTaggedObject tagged0 = new DERTaggedObject(0, kerbOidSeq);
-//        DERBitString bits = new DERBitString(new byte[]{0x01});
-//        DERTaggedObject tagged1 = new DERTaggedObject(1, bits);
         DERTaggedObject tagged2 = new DERTaggedObject(2, ourKerberosTicket);
         ASN1EncodableVector v = new ASN1EncodableVector();
         v.add(tagged0);
-//        v.add(tagged1);
         v.add(tagged2);
         DERSequence seq = new DERSequence(v);
         DERTaggedObject taggedSpnego = new DERTaggedObject(0, seq);
@@ -90,8 +92,14 @@ public class BouncySpnegoTokenGenerator 
         byte[] app = out.toByteArray();
         ASN1InputStream in = new ASN1InputStream(app);
 
-        if( LOG.isDebugEnabled() ){
-            dumpToken(app);
+        if (log.isDebugEnabled() ){
+            int skip = 12;
+            byte [] manipBytes = new byte[app.length - skip];
+            for(int i=skip; i < app.length; i++){
+                manipBytes[i-skip] = app[i];
+            }
+            ASN1InputStream ourSpnego = new ASN1InputStream( manipBytes );
+            log.debug(ASN1Dump.dumpAsString(ourSpnego.readObject()));
         }
         
         return in.readObject().getDEREncoded();
@@ -118,14 +126,4 @@ public class BouncySpnegoTokenGenerator 
         return out.toByteArray();
     }
     
-    protected void dumpToken(byte [] token) throws IOException{
-        int skip = 12;
-        byte [] manipBytes = new byte[token.length - skip];
-        for(int i=skip; i < token.length; i++){
-            manipBytes[i-skip] = token[i];
-        }
-        ASN1InputStream ourSpnego = new ASN1InputStream( manipBytes );
-        System.out.println(ASN1Dump.dumpAsString( ourSpnego.readObject() ) );
-    }
-    
 }