You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by co...@apache.org on 2009/07/02 12:54:55 UTC
svn commit: r790546 - in /webservices/wss4j/trunk:
src/org/apache/ws/security/processor/ test/wssec/
Author: coheigea
Date: Thu Jul 2 10:54:54 2009
New Revision: 790546
URL: http://svn.apache.org/viewvc?rev=790546&view=rev
Log:
[WSS-201] - A fix for some of the processors using the wrong crypto implementation.
- Updated some of the tests to check for this.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS199.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java?rev=790546&r1=790545&r2=790546&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java Thu Jul 2 10:54:54 2009
@@ -80,7 +80,11 @@
List returnResults,
WSSConfig config
) throws WSSecurityException {
- getCertificatesTokenReference(elem, crypto);
+ if (crypto == null) {
+ getCertificatesTokenReference(elem, decCrypto);
+ } else {
+ getCertificatesTokenReference(elem, crypto);
+ }
returnResults.add(
0,
new WSSecurityEngineResult(WSConstants.BST, token, certificates)
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java?rev=790546&r1=790545&r2=790546&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java Thu Jul 2 10:54:54 2009
@@ -70,7 +70,7 @@
if (cb == null) {
throw new WSSecurityException(WSSecurityException.FAILURE, "noCallback");
}
- List dataRefs = handleReferenceList(elem, cb, crypto, wdi);
+ List dataRefs = handleReferenceList(elem, cb, decCrypto, wdi);
returnResults.add(
0,
new WSSecurityEngineResult(WSConstants.ENCR, dataRefs)
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java?rev=790546&r1=790545&r2=790546&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java Thu Jul 2 10:54:54 2009
@@ -36,7 +36,6 @@
import org.apache.ws.security.components.crypto.CryptoFactory;
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -330,7 +329,7 @@
* @throws Exception Thrown when there is a problem in verification
*/
private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, this, crypto);
+ List results = secEngine.processSecurityHeader(doc, null, this, null, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("Verified and decrypted message:");
String outputString =
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java?rev=790546&r1=790545&r2=790546&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java Thu Jul 2 10:54:54 2009
@@ -196,7 +196,8 @@
Document doc,
javax.xml.namespace.QName expectedEncryptedElement
) throws Exception {
- final java.util.List results = secEngine.processSecurityHeader(doc, null, this, crypto);
+ final java.util.List results =
+ secEngine.processSecurityHeader(doc, null, this, null, crypto);
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java?rev=790546&r1=790545&r2=790546&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java Thu Jul 2 10:54:54 2009
@@ -276,7 +276,7 @@
* @throws java.lang.Exception Thrown when there is a problem in verification
*/
private void verify(Document doc) throws Exception {
- secEngine.processSecurityHeader(doc, null, this, crypto);
+ secEngine.processSecurityHeader(doc, null, this, crypto, null);
}
public void handle(Callback[] callbacks)
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS199.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS199.java?rev=790546&r1=790545&r2=790546&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS199.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS199.java Thu Jul 2 10:54:54 2009
@@ -29,16 +29,12 @@
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.message.WSSecUsernameToken;
-import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.util.Base64;
import org.w3c.dom.Document;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.IOException;
-import java.security.MessageDigest;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org