Author: coheigea
Date: Fri Dec 19 03:50:10 2008
New Revision: 728005
URL: http://svn.apache.org/viewvc?rev=728005&view=rev
Log:
[WSS-91] - Removed new-lines from the security header in WSS4J
- WSSecurityUtil#appendChildElement(doc,parent,child) is now deprecated
- Simply use Node#appendChild(Node) instead.
- WSSecurityUtil#prependChildElement(doc,parent,child,addWhiteSpace) is now
deprecated
- It's replacted with WSSecurityUTil#prependChildElement(parent,child)
- All changes should be 100% backwards compatible. It should speed things up a
bit as well.
- Note that xml-sec inserts newlines for signatures, so it isn't *fully*
new-line free.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddSignatureConfirmation.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddTimestamp.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddSAMLToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddUsernameToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSAMLToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureConfirmation.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecTimestamp.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecUsernameToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSignEnvelope.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddSignatureConfirmation.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddSignatureConfirmation.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddSignatureConfirmation.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddSignatureConfirmation.java
Fri Dec 19 03:50:10 2008
@@ -100,8 +100,7 @@
if (id != null) {
sc.setID(id);
}
- WSSecurityUtil.prependChildElement(doc, securityHeader,
- sc.getElement(), true);
+ WSSecurityUtil.prependChildElement(securityHeader, sc.getElement());
sc = null;
return doc;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddTimestamp.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddTimestamp.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddTimestamp.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSAddTimestamp.java
Fri Dec 19 03:50:10 2008
@@ -83,7 +83,7 @@
* <code>wsse:Security</code> header.
*
* @param doc
- * The SOAP enevlope as W3C document
+ * The SOAP envelope as W3C document
* @param ttl
* This is the time difference in seconds between the
* <code>Created</code> and the <code>Expires</code> in
@@ -102,8 +102,7 @@
if (id != null) {
ts.setID(id);
}
- WSSecurityUtil.prependChildElement(doc, securityHeader,
- ts.getElement(), true);
+ WSSecurityUtil.prependChildElement(securityHeader, ts.getElement());
return doc;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
Fri Dec 19 03:50:10 2008
@@ -400,15 +400,9 @@
Element wsseSecurity = insertSecurityHeader(doc);
Element xencEncryptedKey = createEncryptedKey(doc, keyEncAlgo);
if (parentNode == null) {
- WSSecurityUtil.prependChildElement(doc,
- wsseSecurity,
- xencEncryptedKey,
- true);
+ WSSecurityUtil.prependChildElement(wsseSecurity, xencEncryptedKey);
} else {
- WSSecurityUtil.prependChildElement(doc,
- parentNode,
- xencEncryptedKey,
- true);
+ WSSecurityUtil.prependChildElement(parentNode, xencEncryptedKey);
}
SecurityTokenReference secToken = new SecurityTokenReference(doc);
@@ -442,10 +436,7 @@
bstToken.setID(certUri);
ref.setValueType(bstToken.getValueType());
secToken.setReference(ref);
- WSSecurityUtil.prependChildElement(doc,
- wsseSecurity,
- bstToken.getElement(),
- false);
+ WSSecurityUtil.prependChildElement(wsseSecurity,
bstToken.getElement());
break;
default :
@@ -454,8 +445,7 @@
}
KeyInfo keyInfo = new KeyInfo(doc);
keyInfo.addUnknownElement(secToken.getElement());
- WSSecurityUtil.appendChildElement(
- doc, xencEncryptedKey, keyInfo.getElement());
+ xencEncryptedKey.appendChild(keyInfo.getElement());
Element xencCipherValue = createCipherValue(doc, xencEncryptedKey);
xencCipherValue.appendChild(keyText);
@@ -622,7 +612,7 @@
Element tmpE = doc.createElement("temp");
Element refList = createDataRefList(doc, tmpE, encDataRefs);
- WSSecurityUtil.prependChildElement(doc, wsseSecurity, refList, true);
+ WSSecurityUtil.prependChildElement(wsseSecurity, refList);
if (tlog.isDebugEnabled()) {
tlog.debug("EncryptBody embedded: symm-enc " + (t1 - t0));
@@ -676,7 +666,7 @@
doc.createElementNS(WSConstants.ENC_NS,
WSConstants.ENC_PREFIX + ":EncryptionMethod");
encryptionMethod.setAttributeNS(null, "Algorithm", keyTransportAlgo);
- WSSecurityUtil.appendChildElement(doc, encryptedKey, encryptionMethod);
+ encryptedKey.appendChild(encryptionMethod);
return encryptedKey;
}
@@ -703,7 +693,7 @@
doc.createElementNS(WSConstants.ENC_NS,
WSConstants.ENC_PREFIX + ":CipherValue");
cipherData.appendChild(cipherValue);
- WSSecurityUtil.appendChildElement(doc, encryptedKey, cipherData);
+ encryptedKey.appendChild(cipherData);
return cipherValue;
}
@@ -721,7 +711,7 @@
dataReference.setAttributeNS(null, "URI", dataReferenceUri);
referenceList.appendChild(dataReference);
}
- WSSecurityUtil.appendChildElement(doc, encryptedKey, referenceList);
+ encryptedKey.appendChild(referenceList);
return referenceList;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddSAMLToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddSAMLToken.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddSAMLToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddSAMLToken.java
Fri Dec 19 03:50:10 2008
@@ -87,10 +87,7 @@
try {
Element element = (Element) assertion.toDOM(doc);
Element securityHeader = insertSecurityHeader(doc);
- WSSecurityUtil.prependChildElement(doc,
- securityHeader,
- element,
- true);
+ WSSecurityUtil.prependChildElement(securityHeader, element);
} catch (SAMLException ex) {
if (log.isDebugEnabled()) {
log.debug(ex.getMessage(), ex);
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddUsernameToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddUsernameToken.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddUsernameToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSAddUsernameToken.java
Fri Dec 19 03:50:10 2008
@@ -163,7 +163,7 @@
}
if (id != null)
ut.setID(id);
- WSSecurityUtil.prependChildElement(doc, securityHeader,
ut.getElement(), true);
+ WSSecurityUtil.prependChildElement(securityHeader, ut.getElement());
return doc;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
Fri Dec 19 03:50:10 2008
@@ -392,13 +392,12 @@
* The secHeader that holds the Signature element.
*/
public void prependSigToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document,
secHeader.getSecurityHeader(), sig
- .getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
sig.getElement());
}
public void appendSigToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.appendChildElement(document,
secHeader.getSecurityHeader(), sig
- .getElement());
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(sig.getElement());
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
Fri Dec 19 03:50:10 2008
@@ -239,13 +239,13 @@
* The security header that holds the Signature element.
*/
public void prependDKElementToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), dkt.getElement(), false);
+ WSSecurityUtil.prependChildElement(
+ secHeader.getSecurityHeader(), dkt.getElement());
}
public void appendDKElementToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.appendChildElement(document, secHeader
- .getSecurityHeader(), dkt.getElement());
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(dkt.getElement());
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
Fri Dec 19 03:50:10 2008
@@ -416,7 +416,7 @@
* The internal <code>enc:Reference</code> element
*/
public void addInternalRefElement(Element dataRef) {
- WSSecurityUtil.appendChildElement(document, encryptedKeyElement,
dataRef);
+ encryptedKeyElement.appendChild(dataRef);
}
/**
@@ -432,8 +432,7 @@
* The security header.
*/
public void addExternalRefElement(Element dataRef, WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), dataRef, false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
dataRef);
}
private Vector doEncryption(Document doc, SecretKey secretKey,
@@ -663,8 +662,7 @@
Element referenceList = doc.createElementNS(WSConstants.ENC_NS,
WSConstants.ENC_PREFIX + ":ReferenceList");
referenceList = createDataRefList(doc, referenceList, encDataRefs);
- WSSecurityUtil.prependChildElement(doc, wsseSecurity, referenceList,
- true);
+ WSSecurityUtil.prependChildElement(wsseSecurity, referenceList);
return doc;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
Fri Dec 19 03:50:10 2008
@@ -294,8 +294,7 @@
Element keyInfoElement = keyInfo.getElement();
keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
- WSSecurityUtil.appendChildElement(document, encryptedKeyElement,
- keyInfoElement);
+ encryptedKeyElement.appendChild(keyInfoElement);
Element xencCipherValue = createCipherValue(document,
encryptedKeyElement);
@@ -346,7 +345,7 @@
Element encryptionMethod = doc.createElementNS(WSConstants.ENC_NS,
WSConstants.ENC_PREFIX + ":EncryptionMethod");
encryptionMethod.setAttributeNS(null, "Algorithm", keyTransportAlgo);
- WSSecurityUtil.appendChildElement(doc, encryptedKey, encryptionMethod);
+ encryptedKey.appendChild(encryptionMethod);
return encryptedKey;
}
@@ -370,7 +369,7 @@
Element cipherValue = doc.createElementNS(WSConstants.ENC_NS,
WSConstants.ENC_PREFIX + ":CipherValue");
cipherData.appendChild(cipherValue);
- WSSecurityUtil.appendChildElement(doc, encryptedKey, cipherData);
+ encryptedKey.appendChild(cipherData);
return cipherValue;
}
@@ -386,8 +385,8 @@
* The security header that holds the Signature element.
*/
public void prependToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), encryptedKeyElement, false);
+ WSSecurityUtil.prependChildElement(
+ secHeader.getSecurityHeader(), encryptedKeyElement);
}
/**
@@ -402,8 +401,8 @@
* The security header that holds the Signature element.
*/
public void appendToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.appendChildElement(document, secHeader
- .getSecurityHeader(), encryptedKeyElement);
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(encryptedKeyElement);
}
/**
@@ -418,8 +417,8 @@
*/
public void prependBSTElementToHeader(WSSecHeader secHeader) {
if (bstToken != null) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), bstToken.getElement(), false);
+ WSSecurityUtil.prependChildElement(
+ secHeader.getSecurityHeader(), bstToken.getElement());
}
bstToken = null;
}
@@ -436,8 +435,8 @@
*/
public void appendBSTElementToHeader(WSSecHeader secHeader) {
if (bstToken != null) {
- WSSecurityUtil.appendChildElement(document, secHeader
- .getSecurityHeader(), bstToken.getElement());
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(bstToken.getElement());
}
bstToken = null;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSAMLToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSAMLToken.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSAMLToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSAMLToken.java
Fri Dec 19 03:50:10 2008
@@ -80,8 +80,7 @@
throw new RuntimeException(ex.toString(), ex);
}
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), element, false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
element);
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
Fri Dec 19 03:50:10 2008
@@ -76,8 +76,7 @@
public void prependSCTElementToHeader(Document doc, WSSecHeader secHeader)
throws WSSecurityException {
- WSSecurityUtil.prependChildElement(doc, secHeader.getSecurityHeader(),
- sct.getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
sct.getElement());
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java
Fri Dec 19 03:50:10 2008
@@ -617,8 +617,7 @@
* The secHeader that holds the Signature element.
*/
public void prependToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document,
secHeader.getSecurityHeader(), sig
- .getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
sig.getElement());
}
/**
@@ -633,8 +632,8 @@
* The secHeader that holds the Signature element.
*/
public void appendToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.appendChildElement(document,
secHeader.getSecurityHeader(), sig
- .getElement());
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(sig.getElement());
}
/**
@@ -650,8 +649,7 @@
*/
public void prependBSTElementToHeader(WSSecHeader secHeader) {
if (bstToken != null) {
- WSSecurityUtil.prependChildElement(document,
secHeader.getSecurityHeader(),
- bstToken.getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
bstToken.getElement());
}
bstToken = null;
}
@@ -680,8 +678,8 @@
public void appendBSTElementToHeader(WSSecHeader secHeader) {
if (bstToken != null) {
- WSSecurityUtil.appendChildElement(document,
secHeader.getSecurityHeader(),
- bstToken.getElement());
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(bstToken.getElement());
}
bstToken = null;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureConfirmation.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureConfirmation.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureConfirmation.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureConfirmation.java
Fri Dec 19 03:50:10 2008
@@ -36,8 +36,6 @@
private SignatureConfirmation sc = null;
- private Document document = null;
-
byte[] signatureValue = null;
/**
@@ -69,7 +67,6 @@
* The SOAP envelope as W3C document
*/
public void prepare(Document doc) {
- document = doc;
sc = new SignatureConfirmation(doc, signatureValue);
String scId = "SigConf-" + sc.hashCode();
sc.setID(scId);
@@ -87,8 +84,7 @@
* The security header that holds the Signature element.
*/
public void prependToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), sc.getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
sc.getElement());
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecTimestamp.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecTimestamp.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecTimestamp.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecTimestamp.java
Fri Dec 19 03:50:10 2008
@@ -37,8 +37,6 @@
private Timestamp ts = null;
- private Document document = null;
-
private int timeToLive = 300; // time between Created and Expires
/**
@@ -64,16 +62,14 @@
*
* The method prepares and initializes a WSSec Timestamp structure after
the
* relevant information was set. Before calling <code>prepare()</code> the
- * parameter such as <code>timeToLive</code> can be set if the deafult
+ * parameter such as <code>timeToLive</code> can be set if the default
* value is not suitable.
*
* @param doc
* The SOAP enevlope as W3C document
*/
public void prepare(Document doc) {
- document = doc;
- ts = new Timestamp(wssConfig.isPrecisionInMilliSeconds(), doc,
- timeToLive);
+ ts = new Timestamp(wssConfig.isPrecisionInMilliSeconds(), doc,
timeToLive);
String tsId = "Timestamp-" + ts.hashCode();
ts.setID(tsId);
}
@@ -90,8 +86,7 @@
* The security header that holds the Signature element.
*/
public void prependToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), ts.getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
ts.getElement());
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecUsernameToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecUsernameToken.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecUsernameToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecUsernameToken.java
Fri Dec 19 03:50:10 2008
@@ -54,8 +54,6 @@
private int iteration = UsernameToken.DEFAULT_ITERATION;
- private Document document = null;
-
/**
* Constructor.
*/
@@ -174,7 +172,6 @@
* The SOAP envelope as W3C document
*/
public void prepare(Document doc) {
- document = doc;
ut = new UsernameToken(wssConfig.isPrecisionInMilliSeconds(), doc,
passwordType);
ut.setName(user);
@@ -206,8 +203,7 @@
* The security header that holds the Signature element.
*/
public void prependToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), ut.getElement(), false);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
ut.getElement());
}
/**
@@ -222,9 +218,10 @@
* The security header that holds the Signature element.
*/
public void appendToHeader(WSSecHeader secHeader) {
- WSSecurityUtil.appendChildElement(document, secHeader
- .getSecurityHeader(), ut.getElement());
+ Element secHeaderElement = secHeader.getSecurityHeader();
+ secHeaderElement.appendChild(ut.getElement());
}
+
/**
* Adds a new <code>UsernameToken</code> to a soap envelope.
*
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSignEnvelope.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSignEnvelope.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSignEnvelope.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSignEnvelope.java
Fri Dec 19 03:50:10 2008
@@ -475,8 +475,7 @@
sig.addResourceResolver(EnvelopeIdResolver.getInstance());
- WSSecurityUtil.prependChildElement(doc, securityHeader, sig
- .getElement(), false);
+ WSSecurityUtil.prependChildElement(securityHeader, sig.getElement());
if (tlog.isDebugEnabled()) {
t2 = System.currentTimeMillis();
}
@@ -498,8 +497,7 @@
ref.setValueType(bstToken.getValueType());
secRef.setReference(ref);
bstToken.setID(certUri);
- WSSecurityUtil.prependChildElement(doc, securityHeader, bstToken
- .getElement(), false);
+ WSSecurityUtil.prependChildElement(securityHeader,
bstToken.getElement());
wsDocInfo.setBst(bstToken.getElement());
break;
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
Fri Dec 19 03:50:10 2008
@@ -141,8 +141,7 @@
*/
public void setSecurityTokenReference(SecurityTokenReference ref) {
this.elementSecurityTokenReference = ref.getElement();
- //WSSecurityUtil.appendChildElement(doc, this.element,
ref.getElement());
- WSSecurityUtil.prependChildElement(this.element.getOwnerDocument(),
this.element, ref.getElement(), false);
+ WSSecurityUtil.prependChildElement(this.element, ref.getElement());
}
/**
@@ -158,7 +157,7 @@
public void setSecurityTokenReference(Element elem) {
this.elementSecurityTokenReference = elem;
- WSSecurityUtil.prependChildElement(elem.getOwnerDocument(),
this.element, elem, false);
+ WSSecurityUtil.prependChildElement(this.element, elem);
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
Fri Dec 19 03:50:10 2008
@@ -462,12 +462,11 @@
*/
public void prependSAMLElementsToHeader(WSSecHeader secHeader) {
if (senderVouches) {
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), secRefSaml.getElement(), true);
+ WSSecurityUtil.prependChildElement(
+ secHeader.getSecurityHeader(), secRefSaml.getElement());
}
- WSSecurityUtil.prependChildElement(document, secHeader
- .getSecurityHeader(), samlToken, true);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
samlToken);
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
Fri Dec 19 03:50:10 2008
@@ -351,8 +351,7 @@
* on mode) - SecurityTokenRefrence (depends on mode) - SAML token
*/
- WSSecurityUtil.prependChildElement(doc, securityHeader, sig
- .getElement(), false);
+ WSSecurityUtil.prependChildElement(securityHeader, sig.getElement());
if (tlog.isDebugEnabled()) {
t2 = System.currentTimeMillis();
@@ -366,8 +365,7 @@
bstToken = new X509Security(doc);
((X509Security) bstToken).setX509Certificate(certs[0]);
bstToken.setID(certUri);
- WSSecurityUtil.prependChildElement(doc, securityHeader,
- bstToken.getElement(), false);
+ WSSecurityUtil.prependChildElement(securityHeader,
bstToken.getElement());
wsDocInfo.setBst(bstToken.getElement());
ref.setValueType(bstToken.getValueType());
} else {
@@ -414,13 +412,11 @@
"noSAMLdoc", null, e2);
}
if (senderVouches) {
- WSSecurityUtil.prependChildElement(doc, securityHeader, secRefSaml
- .getElement(), true);
+ WSSecurityUtil.prependChildElement(securityHeader,
secRefSaml.getElement());
}
wsDocInfo.setAssertion(samlToken);
- WSSecurityUtil
- .prependChildElement(doc, securityHeader, samlToken, true);
+ WSSecurityUtil.prependChildElement(securityHeader, samlToken);
WSDocInfoStore.store(wsDocInfo);
try {
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
Fri Dec 19 03:50:10 2008
@@ -185,7 +185,7 @@
public static Node findElement(Node startNode, String name, String
namespace) {
/*
- * Replace the formely recursive implementation with a depth-first-loop
+ * Replace the formerly recursive implementation with a
depth-first-loop
* lookup
*/
if (startNode == null) {
@@ -231,7 +231,7 @@
}
/**
- * Returns the single element that containes an Id with value
+ * Returns the single element that contains an Id with value
* <code>uri</code> and <code>namespace</code>. <p/> This is a
* replacement for a XPath Id lookup with the given namespace. It's
somewhat
* faster than XPath, and we do not deal with prefixes, just with the real
@@ -273,8 +273,7 @@
foundElement = se; // Continue searching to find
// duplicates
} else {
- log
- .warn("Multiple elements with the same 'Id'
attribute value!");
+ log.warn("Multiple elements with the same 'Id'
attribute value!");
return null;
}
}
@@ -322,10 +321,9 @@
}
/*
- * ** The following methods were copied over from aixs.utils.XMLUtils and
+ * The following methods were copied over from axis.utils.XMLUtils and
* adapted
*/
-
public static String getPrefixNS(String uri, Node e) {
while (e != null && (e.getNodeType() == Element.ELEMENT_NODE)) {
NamedNodeMap attrs = e.getAttributes();
@@ -549,15 +547,41 @@
* element of this child element
* @param child
* the element to append
+ * @deprecated use {...@link Node#appendChild(Node)} instead
* @return the child element
*/
- public static Element appendChildElement(Document doc, Element parent,
- Element child) {
+ public static Element appendChildElement(
+ Document doc,
+ Element parent,
+ Element child
+ ) {
Node whitespaceText = doc.createTextNode("\n");
parent.appendChild(whitespaceText);
parent.appendChild(child);
return child;
}
+
+ /**
+ * prepend a child element <p/>
+ *
+ * @param parent
+ * element of this child element
+ * @param child
+ * the element to append
+ * @return the child element
+ */
+ public static Element prependChildElement(
+ Element parent,
+ Element child
+ ) {
+ Node firstChild = parent.getFirstChild();
+ if (firstChild == null) {
+ parent.appendChild(child);
+ } else {
+ parent.insertBefore(child, firstChild);
+ }
+ return child;
+ }
/**
* prepend a child element <p/>
@@ -570,6 +594,8 @@
* the element to append
* @param addWhitespace
* if true prepend a newline before child
+ * @deprecated use {...@link WSSecurityUtil#prependChildElement(Element,
Element)}
+ * instead
* @return the child element
*/
public static Element prependChildElement(Document doc, Element parent,
@@ -628,14 +654,14 @@
if (header == null && doCreate) {
header = createElementInSameNamespace(envelope, sc
.getHeaderQName().getLocalPart());
- header = prependChildElement(doc, envelope, header, true);
+ header = prependChildElement(envelope, header);
}
if (doCreate) {
wsseSecurity = header.getOwnerDocument().createElementNS(
WSConstants.WSSE_NS, "wsse:Security");
wsseSecurity.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:wsse",
WSConstants.WSSE_NS);
- return prependChildElement(doc, header, wsseSecurity, true);
+ return prependChildElement(header, wsseSecurity);
}
return null;
}
@@ -845,7 +871,7 @@
try {
final SecureRandom r = resolveSecureRandom();
if (r == null) {
- throw new WSSecurityException("Random generator is not
initialzed.");
+ throw new WSSecurityException("Random generator is not
initialized.");
}
byte[] temp = new byte[length];
r.nextBytes(temp);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java?rev=728005&r1=728004&r2=728005&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java Fri Dec 19
03:50:10 2008
@@ -32,19 +32,13 @@
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
import org.apache.ws.security.message.WSSecDKEncrypt;
import org.apache.ws.security.message.WSSecDKSign;
-import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.message.WSSecSignature;
import org.apache.ws.security.message.WSSecUsernameToken;
import org.apache.ws.security.message.token.UsernameToken;
-import org.apache.ws.security.processor.Processor;
-import org.apache.ws.security.processor.UsernameTokenProcessor;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.xml.security.signature.XMLSignature;
import org.w3c.dom.Document;
@@ -54,10 +48,8 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
import java.util.Vector;
@@ -160,7 +152,7 @@
assertTrue(usernameToken.getIteration() == 500);
WSSecurityUtil.prependChildElement(
- doc, secHeader.getSecurityHeader(), usernameToken.getElement(),
false
+ secHeader.getSecurityHeader(), usernameToken.getElement()
);
String outputString =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
