You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2012/12/06 19:11:44 UTC
svn commit: r1418021 [2/3] - in /webservices/wss4j/trunk:
ws-security-common/src/main/java/org/apache/ws/security/common/saml/
ws-security-common/src/main/java/org/apache/ws/security/common/saml/bean/
ws-security-dom/src/main/java/org/apache/ws/securit...
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/SAMLElementCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/SAMLElementCallbackHandler.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/SAMLElementCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/SAMLElementCallbackHandler.java Thu Dec 6 18:11:37 2012
@@ -25,7 +25,7 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
/**
* A Callback Handler implementation for a SAML 1.1 assertion. Rather than create a set of beans
- * that AssertionWrapper will use to create a SAML Assertion, it sets a DOM Element directly on
+ * that SamlAssertionWrapper will use to create a SAML Assertion, it sets a DOM Element directly on
* the SAMLCallback object.
*/
public class SAMLElementCallbackHandler extends AbstractSAMLCallbackHandler {
@@ -73,10 +73,10 @@ public class SAMLElementCallbackHandler
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertionWrapper = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertionWrapper = new SamlAssertionWrapper(samlCallback);
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- return assertionWrapper.toDOM(factory.newDocumentBuilder().newDocument());
+ return samlAssertionWrapper.toDOM(factory.newDocumentBuilder().newDocument());
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/ModifiedRequestTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/ModifiedRequestTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/ModifiedRequestTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/ModifiedRequestTest.java Thu Dec 6 18:11:37 2012
@@ -30,7 +30,7 @@ import org.apache.ws.security.dom.common
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -230,7 +230,7 @@ public class ModifiedRequestTest extends
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -241,10 +241,10 @@ public class ModifiedRequestTest extends
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
- Element assertionElement = (Element)assertion.getElement().cloneNode(true);
+ Element assertionElement = (Element) samlAssertion.getElement().cloneNode(true);
assertionElement.removeChild(assertionElement.getFirstChild());
secHeader.getSecurityHeader().appendChild(assertionElement);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/SignaturePartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/SignaturePartsTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/SignaturePartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/message/SignaturePartsTest.java Thu Dec 6 18:11:37 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.dom.message;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.SOAPConstants;
import org.apache.ws.security.dom.WSDataRef;
import org.apache.ws.security.dom.WSEncryptionPart;
@@ -32,7 +33,6 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.Merlin;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -187,8 +187,8 @@ public class SignaturePartsTest extends
samlCallback.setIssuer("www.example.com");
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -207,7 +207,7 @@ public class SignaturePartsTest extends
//
// set up for keyHolder
//
- Document signedDoc = wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
+ Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML message (key holder):");
@@ -227,10 +227,10 @@ public class SignaturePartsTest extends
secEngine.processSecurityHeader(doc, null, null, trustCrypto);
WSSecurityEngineResult stUnsignedActionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) stUnsignedActionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) stUnsignedActionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
WSSecurityEngineResult signActionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/misc/PrincipalTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/misc/PrincipalTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/misc/PrincipalTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/misc/PrincipalTest.java Thu Dec 6 18:11:37 2012
@@ -33,7 +33,7 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.util.XMLUtils;
@@ -132,7 +132,7 @@ public class PrincipalTest extends org.j
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -140,7 +140,7 @@ public class PrincipalTest extends org.j
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -151,9 +151,9 @@ public class PrincipalTest extends org.j
List<WSSecurityEngineResult> results = verify(unsignedDoc, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
@@ -173,7 +173,7 @@ public class PrincipalTest extends org.j
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -181,7 +181,7 @@ public class PrincipalTest extends org.j
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -192,9 +192,9 @@ public class PrincipalTest extends org.j
List<WSSecurityEngineResult> results = verify(unsignedDoc, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
@@ -215,7 +215,7 @@ public class PrincipalTest extends org.j
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -223,7 +223,7 @@ public class PrincipalTest extends org.j
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -235,9 +235,9 @@ public class PrincipalTest extends org.j
verify(unsignedDoc, new DummyValidator(), WSSecurityEngine.SAML_TOKEN, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
@@ -329,9 +329,9 @@ public class PrincipalTest extends org.j
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- credential.setTransformedToken(assertion);
+ credential.setTransformedToken(samlAssertion);
return credential;
} catch (Exception ex) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlAlgorithmSuiteTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlAlgorithmSuiteTest.java Thu Dec 6 18:11:37 2012
@@ -19,12 +19,9 @@
package org.apache.ws.security.dom.saml;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -41,7 +38,6 @@ import org.apache.ws.security.dom.common
import org.apache.ws.security.dom.handler.RequestData;
import org.apache.ws.security.dom.message.WSSecHeader;
import org.apache.ws.security.dom.message.WSSecSAMLToken;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -71,9 +67,9 @@ public class SamlAlgorithmSuiteTest exte
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+ samlAssertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -81,7 +77,7 @@ public class SamlAlgorithmSuiteTest exte
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -115,9 +111,9 @@ public class SamlAlgorithmSuiteTest exte
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40DSA", "security", dsaCrypto, false);
+ samlAssertion.signAssertion("wss40DSA", "security", dsaCrypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -125,7 +121,7 @@ public class SamlAlgorithmSuiteTest exte
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -156,9 +152,9 @@ public class SamlAlgorithmSuiteTest exte
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion(
+ samlAssertion.signAssertion(
"16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false,
WSConstants.C14N_EXCL_WITH_COMMENTS, WSConstants.RSA_SHA1);
@@ -168,7 +164,7 @@ public class SamlAlgorithmSuiteTest exte
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlConditionsTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlConditionsTest.java Thu Dec 6 18:11:37 2012
@@ -21,6 +21,7 @@ package org.apache.ws.security.dom.saml;
import java.util.List;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.WSConstants;
import org.apache.ws.security.dom.WSSConfig;
import org.apache.ws.security.dom.WSSecurityEngine;
@@ -30,7 +31,6 @@ import org.apache.ws.security.dom.common
import org.apache.ws.security.dom.common.SAML2CallbackHandler;
import org.apache.ws.security.dom.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.bean.ConditionsBean;
@@ -74,7 +74,7 @@ public class SamlConditionsTest extends
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -82,7 +82,7 @@ public class SamlConditionsTest extends
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
@@ -94,11 +94,11 @@ public class SamlConditionsTest extends
List<WSSecurityEngineResult> results = verify(unsignedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(!receivedAssertion.isSigned());
- assertTrue(receivedAssertion.getSignatureValue() == null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(!receivedSamlAssertion.isSigned());
+ assertTrue(receivedSamlAssertion.getSignatureValue() == null);
}
/**
@@ -119,7 +119,7 @@ public class SamlConditionsTest extends
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -127,7 +127,7 @@ public class SamlConditionsTest extends
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
@@ -162,7 +162,7 @@ public class SamlConditionsTest extends
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -170,7 +170,7 @@ public class SamlConditionsTest extends
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
@@ -205,7 +205,7 @@ public class SamlConditionsTest extends
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -213,7 +213,7 @@ public class SamlConditionsTest extends
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlNegativeTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlNegativeTest.java Thu Dec 6 18:11:37 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.dom.saml;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.WSConstants;
import org.apache.ws.security.dom.WSSConfig;
import org.apache.ws.security.dom.WSSecurityEngine;
@@ -33,7 +34,6 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.crypto.Merlin;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.bean.SubjectBean;
@@ -103,7 +103,7 @@ public class SamlNegativeTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -114,7 +114,7 @@ public class SamlNegativeTest extends or
Document signedDoc =
wsSign.build(
- doc, null, assertion, userCrypto, "wss40", "security", secHeader
+ doc, null, samlAssertion, userCrypto, "wss40", "security", secHeader
);
//
@@ -155,9 +155,9 @@ public class SamlNegativeTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -165,7 +165,7 @@ public class SamlNegativeTest extends or
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
//
// Modify the assertion
@@ -207,9 +207,9 @@ public class SamlNegativeTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -217,7 +217,7 @@ public class SamlNegativeTest extends or
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
//
// Modify the assertion
//
@@ -254,16 +254,16 @@ public class SamlNegativeTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(signedDoc);
@@ -293,7 +293,7 @@ public class SamlNegativeTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
samlCallback.setIssuer("www.example.com");
samlCallback.setIssuerCrypto(issuerCrypto);
@@ -306,7 +306,7 @@ public class SamlNegativeTest extends or
secHeader.insertSecurityHeader(doc);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(signedDoc);
@@ -336,9 +336,9 @@ public class SamlNegativeTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion(
+ samlAssertion.signAssertion(
"16c73ab6-b892-458f-abf5-2f875f74882e", "security",
CryptoFactory.getInstance("crypto.properties"), false
);
@@ -354,7 +354,7 @@ public class SamlNegativeTest extends or
secHeader.insertSecurityHeader(doc);
Document signedDoc =
- wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
+ wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(signedDoc);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlReferenceTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlReferenceTest.java Thu Dec 6 18:11:37 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.dom.saml;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.WSConstants;
import org.apache.ws.security.dom.WSDataRef;
import org.apache.ws.security.dom.WSEncryptionPart;
@@ -32,7 +33,6 @@ import org.apache.ws.security.dom.common
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.Merlin;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -100,7 +100,7 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -110,7 +110,7 @@ public class SamlReferenceTest extends o
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -126,9 +126,9 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -163,7 +163,7 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -174,7 +174,7 @@ public class SamlReferenceTest extends o
wsSign.setUseDirectReferenceToAssertion(true);
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -190,9 +190,9 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -227,9 +227,9 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -241,7 +241,7 @@ public class SamlReferenceTest extends o
secHeader.insertSecurityHeader(doc);
Document signedDoc =
- wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
+ wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(doc);
@@ -255,10 +255,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -290,9 +290,9 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -306,7 +306,7 @@ public class SamlReferenceTest extends o
secHeader.insertSecurityHeader(doc);
Document signedDoc =
- wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
+ wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(doc);
@@ -320,10 +320,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -361,12 +361,12 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
Crypto crypto = CryptoFactory.getInstance("crypto.properties");
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Document samlDoc =
- wsSign.build(doc, null, assertion, crypto,
+ wsSign.build(doc, null, samlAssertion, crypto,
"16c73ab6-b892-458f-abf5-2f875f74882e", "security", secHeader
);
@@ -414,13 +414,13 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
- Node assertionNode = assertion.toDOM(doc);
+ Node assertionNode = samlAssertion.toDOM(doc);
secHeader.insertSecurityHeader(doc);
secHeader.getSecurityHeader().appendChild(assertionNode);
@@ -430,7 +430,7 @@ public class SamlReferenceTest extends o
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
builder.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER);
builder.setCustomEKTokenValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- builder.setCustomEKTokenId(assertion.getId());
+ builder.setCustomEKTokenId(samlAssertion.getId());
builder.prepare(doc, userCrypto);
List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
@@ -455,10 +455,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(doc, trustCrypto, userCrypto);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ENCR);
@@ -492,12 +492,12 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
- Node assertionNode = assertion.toDOM(doc);
+ Node assertionNode = samlAssertion.toDOM(doc);
secHeader.insertSecurityHeader(doc);
secHeader.getSecurityHeader().appendChild(assertionNode);
@@ -507,7 +507,7 @@ public class SamlReferenceTest extends o
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
builder.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
builder.setCustomEKTokenValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- builder.setCustomEKTokenId(assertion.getId());
+ builder.setCustomEKTokenId(samlAssertion.getId());
builder.prepare(doc, userCrypto);
List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
@@ -532,10 +532,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(doc, trustCrypto, userCrypto);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ENCR);
@@ -565,7 +565,7 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -575,7 +575,7 @@ public class SamlReferenceTest extends o
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -591,9 +591,9 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -627,7 +627,7 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -638,7 +638,7 @@ public class SamlReferenceTest extends o
wsSign.setUseDirectReferenceToAssertion(true);
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -654,9 +654,9 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -691,9 +691,9 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -705,7 +705,7 @@ public class SamlReferenceTest extends o
secHeader.insertSecurityHeader(doc);
Document signedDoc =
- wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
+ wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(doc);
@@ -719,10 +719,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -754,9 +754,9 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -770,7 +770,7 @@ public class SamlReferenceTest extends o
secHeader.insertSecurityHeader(doc);
Document signedDoc =
- wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
+ wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader);
String outputString =
XMLUtils.PrettyDocumentToString(doc);
@@ -784,10 +784,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, null);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -819,13 +819,13 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
- Node assertionNode = assertion.toDOM(doc);
+ Node assertionNode = samlAssertion.toDOM(doc);
secHeader.insertSecurityHeader(doc);
secHeader.getSecurityHeader().appendChild(assertionNode);
@@ -835,7 +835,7 @@ public class SamlReferenceTest extends o
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
builder.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER);
builder.setCustomEKTokenValueType(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- builder.setCustomEKTokenId(assertion.getId());
+ builder.setCustomEKTokenId(samlAssertion.getId());
builder.prepare(doc, userCrypto);
List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
@@ -860,10 +860,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(doc, trustCrypto, userCrypto);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ENCR);
@@ -896,13 +896,13 @@ public class SamlReferenceTest extends o
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
+ samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
- Node assertionNode = assertion.toDOM(doc);
+ Node assertionNode = samlAssertion.toDOM(doc);
secHeader.insertSecurityHeader(doc);
secHeader.getSecurityHeader().appendChild(assertionNode);
@@ -912,7 +912,7 @@ public class SamlReferenceTest extends o
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
builder.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
builder.setCustomEKTokenValueType(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- builder.setCustomEKTokenId(assertion.getId());
+ builder.setCustomEKTokenId(samlAssertion.getId());
builder.prepare(doc, userCrypto);
List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
@@ -937,10 +937,10 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results = verify(doc, trustCrypto, userCrypto);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ENCR);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenDerivedTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenDerivedTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenDerivedTest.java Thu Dec 6 18:11:37 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.dom.saml;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.WSConstants;
import org.apache.ws.security.dom.WSDataRef;
import org.apache.ws.security.dom.WSEncryptionPart;
@@ -32,7 +33,6 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -83,15 +83,15 @@ public class SamlTokenDerivedTest extend
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
SecurityTokenReference secRefSaml =
- createSamlSTR(doc, assertion, WSSConfig.getNewInstance());
- secHeader.getSecurityHeader().appendChild(assertion.toDOM(doc));
+ createSamlSTR(doc, samlAssertion, WSSConfig.getNewInstance());
+ secHeader.getSecurityHeader().appendChild(samlAssertion.toDOM(doc));
secHeader.getSecurityHeader().appendChild(secRefSaml.getElement());
//
@@ -111,9 +111,9 @@ public class SamlTokenDerivedTest extend
List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -137,7 +137,7 @@ public class SamlTokenDerivedTest extend
*/
private SecurityTokenReference createSamlSTR(
Document doc,
- AssertionWrapper assertion,
+ SamlAssertionWrapper samlAssertion,
WSSConfig wssConfig
) {
SecurityTokenReference secRefSaml = new SecurityTokenReference(doc);
@@ -146,7 +146,7 @@ public class SamlTokenDerivedTest extend
org.apache.ws.security.dom.message.token.Reference ref =
new org.apache.ws.security.dom.message.token.Reference(doc);
- ref.setURI("#" + assertion.getId());
+ ref.setURI("#" + samlAssertion.getId());
ref.setValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE);
secRefSaml.addTokenType(WSConstants.WSS_SAML_TOKEN_TYPE);
secRefSaml.setReference(ref);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenHOKTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenHOKTest.java Thu Dec 6 18:11:37 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.dom.saml;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.WSConstants;
import org.apache.ws.security.dom.WSSConfig;
import org.apache.ws.security.dom.WSSecurityEngine;
@@ -29,7 +30,6 @@ import org.apache.ws.security.dom.common
import org.apache.ws.security.dom.common.SOAPUtil;
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -71,9 +71,9 @@ public class SamlTokenHOKTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+ samlAssertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -81,7 +81,7 @@ public class SamlTokenHOKTest extends or
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (holder-of-key):");
@@ -93,11 +93,11 @@ public class SamlTokenHOKTest extends or
List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
- assertNotNull(receivedAssertion.assertionToString());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
+ assertNotNull(receivedSamlAssertion.assertionToString());
}
/**
@@ -112,9 +112,9 @@ public class SamlTokenHOKTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+ samlAssertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -122,7 +122,7 @@ public class SamlTokenHOKTest extends or
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document signedDoc = wsSign.build(doc, assertion, secHeader);
+ Document signedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Attr Assertion (holder-of-key):");
@@ -140,10 +140,10 @@ public class SamlTokenHOKTest extends or
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
}
/**
@@ -158,9 +158,9 @@ public class SamlTokenHOKTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+ samlAssertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -168,7 +168,7 @@ public class SamlTokenHOKTest extends or
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (holder-of-key):");
@@ -180,10 +180,10 @@ public class SamlTokenHOKTest extends or
List<WSSecurityEngineResult> results = verify(unsignedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
- assertTrue(receivedAssertion.isSigned());
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
+ assertTrue(receivedSamlAssertion.isSigned());
}
/**
@@ -198,9 +198,9 @@ public class SamlTokenHOKTest extends or
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
- assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+ samlAssertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -209,7 +209,7 @@ public class SamlTokenHOKTest extends or
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
+ Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Attr Assertion (holder-of-key):");
@@ -227,9 +227,9 @@ public class SamlTokenHOKTest extends or
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenSVTest.java?rev=1418021&r1=1418020&r2=1418021&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/saml/SamlTokenSVTest.java Thu Dec 6 18:11:37 2012
@@ -19,6 +19,7 @@
package org.apache.ws.security.dom.saml;
+import org.apache.ws.security.common.saml.SamlAssertionWrapper;
import org.apache.ws.security.dom.WSConstants;
import org.apache.ws.security.dom.WSDataRef;
import org.apache.ws.security.dom.WSSConfig;
@@ -31,7 +32,6 @@ import org.apache.ws.security.dom.common
import org.apache.ws.security.dom.common.SOAPUtil;
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
-import org.apache.ws.security.common.saml.AssertionWrapper;
import org.apache.ws.security.common.saml.SAMLCallback;
import org.apache.ws.security.common.saml.SAMLUtil;
import org.apache.ws.security.common.saml.builder.SAML1Constants;
@@ -76,7 +76,7 @@ public class SamlTokenSVTest extends org
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -87,7 +87,7 @@ public class SamlTokenSVTest extends org
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -102,9 +102,9 @@ public class SamlTokenSVTest extends org
List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -136,7 +136,7 @@ public class SamlTokenSVTest extends org
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -147,7 +147,7 @@ public class SamlTokenSVTest extends org
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -162,9 +162,9 @@ public class SamlTokenSVTest extends org
List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -196,7 +196,7 @@ public class SamlTokenSVTest extends org
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -207,7 +207,7 @@ public class SamlTokenSVTest extends org
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -222,9 +222,9 @@ public class SamlTokenSVTest extends org
List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -256,7 +256,7 @@ public class SamlTokenSVTest extends org
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -267,7 +267,7 @@ public class SamlTokenSVTest extends org
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
@@ -282,9 +282,9 @@ public class SamlTokenSVTest extends org
List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
- AssertionWrapper receivedAssertion =
- (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- assertTrue(receivedAssertion != null);
+ SamlAssertionWrapper receivedSamlAssertion =
+ (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+ assertTrue(receivedSamlAssertion != null);
// Test we processed a signature (SAML assertion + SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -318,7 +318,7 @@ public class SamlTokenSVTest extends org
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
- AssertionWrapper assertion = new AssertionWrapper(samlCallback);
+ SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -330,7 +330,7 @@ public class SamlTokenSVTest extends org
Document signedDoc =
wsSign.build(
- doc, null, assertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
+ doc, null, samlAssertion, crypto, "16c73ab6-b892-458f-abf5-2f875f74882e",
"security", secHeader
);
//