[jbossws-commits] JBossWS SVN: r12503 - in stack/native/branches/dlofthouse/JBPAPP-4447/src: test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2010-06-18 08:53:20 -0400 (Fri, 18 Jun 2010)
New Revision: 12503

Modified:
   stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
   stack/native/branches/dlofthouse/JBPAPP-4447/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java
Log:
Corrected format of nonce used to generate digest.

Modified: stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java	2010-06-18 12:46:49 UTC (rev 12502)
+++ stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java	2010-06-18 12:53:20 UTC (rev 12503)
@@ -34,6 +34,7 @@
 import org.jboss.crypto.digest.DigestCallback;
 import org.jboss.security.Base64Encoder;
 import org.jboss.security.auth.callback.MapCallback;
+import org.jboss.util.Base64;
 import org.jboss.ws.WSException;
 
 /**
@@ -68,7 +69,10 @@
       {
          String nonce = (String)info.getInfo(NONCE);
          if (nonce != null)
-            digest.update(nonce.getBytes("UTF-8"));
+         {
+            byte[] rawNonce = Base64.decode(nonce);
+            digest.update(rawNonce);
+         }
          String created = (String)info.getInfo(CREATED);
          if (created != null)
             digest.update(created.getBytes("UTF-8"));

Modified: stack/native/branches/dlofthouse/JBPAPP-4447/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-4447/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java	2010-06-18 12:46:49 UTC (rev 12502)
+++ stack/native/branches/dlofthouse/JBPAPP-4447/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java	2010-06-18 12:53:20 UTC (rev 12503)
@@ -37,14 +37,14 @@
       String password = "taadtaadpstcsm";
       String nonce = "d36e316282959a9ed4c89851497a717f";
       String created = "2003-12-15T14:43:07Z";
-      String expectedDigest = "quR/EWLAV4xLf9Zqyw4pDmfV9OY=";
+      String expectedDigest = "0WSAldY9ogqqVyQo7ubbZxxFU/s=";
       String digest = SendUsernameOperation.createPasswordDigest(nonce, created, password);
       assertEquals(expectedDigest, digest);
       
       password = "therealfrog";
       nonce = "gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=";
       created = "2008-03-12T17:12:31.310Z";
-      expectedDigest = "IEeuDaP/NTozwiyJHzTgBoCCDjg=";
+      expectedDigest = "gx8TcJ9VG2hOFC6ZFmNi/JI2rh4=";
       digest = SendUsernameOperation.createPasswordDigest(nonce, created, password);
       assertEquals(expectedDigest, digest);
    }
@@ -53,7 +53,7 @@
    {
       String password = "therealfrog";
       String nonce = "gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=";
-      String expectedDigest = "sdA2umjMZQEY2ejbt5L6WbJOrB0=";
+      String expectedDigest = "MBqDfskkdh3eEtRlLdkWa79+w58=";
       String digest = SendUsernameOperation.createPasswordDigest(nonce, null, password);
       assertEquals(expectedDigest, digest);
    }