[jboss-cvs] JBossAS SVN: r76854 - in projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src: tests/java/org/jboss/security/negotiation/ntlm/encoding and 1 other directory.

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

Author: darran.lofthouse at jboss.com
Date: 2008-08-09 08:50:00 -0400 (Sat, 09 Aug 2008)
New Revision: 76854

Modified:
   projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java
   projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java
Log:
[SECURITY-270] Add a test using the token provided by Firefox.

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java	2008-08-09 12:42:34 UTC (rev 76853)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/main/java/org/jboss/security/negotiation/ntlm/encoding/NegotiateMessageDecoder.java	2008-08-09 12:50:00 UTC (rev 76854)
@@ -21,7 +21,6 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
-import org.jboss.security.negotiation.common.DebugHelper;
 import org.jboss.security.negotiation.ntlm.Constants;
 
 /**
@@ -148,8 +147,6 @@
 
    public static NegotiateMessage decode(final byte[] token) throws IOException
    {
-      System.out.println(DebugHelper.convertToHex(token));
-      
       DecoderData data = new DecoderData();
       ByteArrayInputStream bais = new ByteArrayInputStream(token);
 

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java	2008-08-09 12:42:34 UTC (rev 76853)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/src/tests/java/org/jboss/security/negotiation/ntlm/encoding/NegotiationMessageDecoderTest.java	2008-08-09 12:50:00 UTC (rev 76854)
@@ -35,7 +35,7 @@
     * Simple test case to test decoding an NTLM message
     * created by Java.
     */
-   public void testDecode() throws Exception
+   public void testDecode_JavaClient() throws Exception
    {
       String message = "TlRMTVNTUAABAAAAA7IAAAYABgAoAAAACAAIACAAAABLRVJCRVJPU2RvbWFpbg==";
       byte[] requestMessage = Base64.decode(message);
@@ -48,4 +48,16 @@
       System.out.println(negMessage);
    }
 
+   public void testDecode_FirefoxClient() throws Exception
+   {
+      String message = "TlRMTVNTUAABAAAAB4IIAAAAAAAAAAAAAAAAAAAAAAA=";
+      byte[] requestMessage = Base64.decode(message);
+
+      NegotiateMessage negMessage = NegotiateMessageDecoder.decode(requestMessage);
+
+      assertNull("Domain", negMessage.getDomainName());
+      assertNull("Name", negMessage.getWorkstationName());
+
+      System.out.println(negMessage);
+   }
 }