11:34 a.m.
Author: bmaxwell
Date: 2011-03-24 12:34:13 -0400 (Thu, 24 Mar 2011)
New Revision: 13931
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
Log:
[JBPAPP-6163] one off for JBWS-2640 JBWS-3014
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2:13621
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2011-03-24
16:13:58 UTC (rev 13930)
+++
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2011-03-24
16:34:13 UTC (rev 13931)
@@ -32,6 +32,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;
/**
@@ -64,7 +65,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"));
Property changes on:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
___________________________________________________________________
Added: svn:mergeinfo
+
/stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java:13621
/stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java:12502
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2011-03-24
16:13:58 UTC (rev 13930)
+++
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2011-03-24
16:34:13 UTC (rev 13931)
@@ -96,7 +96,7 @@
this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
}
- Iterator<Element> itCreated = DOMUtils.getChildElements(element, new
QName(Constants.WSSE_NS, "Created"));
+ Iterator<Element> itCreated = DOMUtils.getChildElements(element, new
QName(Constants.WSU_NS, "Created"));
if (itCreated != null && itCreated.hasNext())
{
this.created = XMLUtils.getFullTextChildrenFromElement(itCreated.next());
@@ -163,7 +163,7 @@
}
if (created != null)
{
- child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX +
":" + "Created");
+ child = doc.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX +
":" + "Created");
child.appendChild(doc.createTextNode(created));
element.appendChild(child);
}
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2011-03-24
16:13:58 UTC (rev 13930)
+++
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2011-03-24
16:34:13 UTC (rev 13931)
@@ -112,7 +112,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password
Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-usernam...
+
"<wsse:Nonce
EncodingType='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss...
+
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -148,7 +148,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password
Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-usernam...
+
"<wsse:Nonce>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>"
+
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -196,7 +196,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"),
Constants.WSS_SOAP_NS+"#Base64Binary");
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new
QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new
QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
@@ -218,7 +218,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"),
Constants.WSS_SOAP_NS+"#Base64Binary");
- assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS,
"Created")).hasNext());
+ assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS,
"Created")).hasNext());
}
public void testEncodeMessageWithCreated() throws Exception
@@ -235,7 +235,7 @@
Element usernameTokenEl = (Element)DOMUtils.getChildElements(securityEl, new
QName(Constants.WSSE_NS, "UsernameToken")).next();
assertPassword(usernameTokenEl);
assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS,
"Nonce")).hasNext());
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new
QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new
QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}