You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/03/24 16:34:35 UTC
svn commit: r1085002 - in /webservices/wss4j/trunk: legal/ lib/
src/main/java/org/apache/ws/security/saml/
src/main/java/org/apache/ws/security/saml/ext/
src/test/java/org/apache/ws/security/common/
src/test/java/org/apache/ws/security/saml/
Author: coheigea
Date: Thu Mar 24 15:34:34 2011
New Revision: 1085002
URL: http://svn.apache.org/viewvc?rev=1085002&view=rev
Log:
Some changes to the SAML creation code.
Removed:
webservices/wss4j/trunk/legal/LICENSE.velocity
webservices/wss4j/trunk/lib/velocity-1.5.jar
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/SAMLCallback.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/AbstractSAMLCallbackHandler.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java Thu Mar 24 15:34:34 2011
@@ -24,21 +24,11 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.OpenSAMLUtil;
import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.util.Loader;
-import org.opensaml.xml.security.x509.BasicX509Credential;
-import org.opensaml.xml.security.x509.X509KeyInfoGeneratorFactory;
-import org.opensaml.xml.signature.KeyInfo;
-import org.opensaml.xml.signature.Signature;
-import org.opensaml.xml.signature.SignatureConstants;
-
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
import java.util.Properties;
import javax.security.auth.callback.CallbackHandler;
@@ -154,68 +144,8 @@ public class SAMLIssuerImpl implements S
samlParms.setCallbackHandler(callbackHandler);
AssertionWrapper sa = new AssertionWrapper(samlParms);
-
if (signAssertion) {
- //
- // Create the signature
- //
- Signature signature = OpenSAMLUtil.buildSignature();
- signature.setCanonicalizationAlgorithm(
- SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS
- );
-
- // prepare to sign the SAML token
- CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
- cryptoType.setAlias(issuerKeyName);
- X509Certificate[] issuerCerts = issuerCrypto.getX509Certificates(cryptoType);
- if (issuerCerts == null) {
- throw new WSSecurityException(
- "No issuer certs were found to sign the SAML Assertion using issuer name: "
- + issuerKeyName
- );
- }
-
- String sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1;
- String pubKeyAlgo = issuerCerts[0].getPublicKey().getAlgorithm();
- if (log.isDebugEnabled()) {
- log.debug("automatic sig algo detection: " + pubKeyAlgo);
- }
- if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
- sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_DSA;
- }
- PrivateKey privateKey = null;
- try {
- privateKey = issuerCrypto.getPrivateKey(issuerKeyName, issuerKeyPassword);
- } catch (Exception ex) {
- throw new WSSecurityException(ex.getMessage(), ex);
- }
-
- signature.setSignatureAlgorithm(sigAlgo);
-
- BasicX509Credential signingCredential = new BasicX509Credential();
- signingCredential.setEntityCertificate(issuerCerts[0]);
- signingCredential.setPrivateKey(privateKey);
- signingCredential.setEntityId(issuer);
-
- signature.setSigningCredential(signingCredential);
-
- X509KeyInfoGeneratorFactory kiFactory = new X509KeyInfoGeneratorFactory();
- if (sendKeyValue) {
- kiFactory.setEmitPublicKeyValue(true);
- } else {
- kiFactory.setEmitEntityCertificate(true);
- }
- try {
- KeyInfo keyInfo = kiFactory.newInstance().generate(signingCredential);
- signature.setKeyInfo(keyInfo);
- } catch (org.opensaml.xml.security.SecurityException ex) {
- throw new WSSecurityException(
- "Error generating KeyInfo from signing credential", ex
- );
- }
-
- // add the signature to the assertion
- sa.setSignature(signature);
+ sa.signAssertion(issuerKeyName, issuerKeyPassword, issuerCrypto, sendKeyValue);
}
return sa;
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java Thu Mar 24 15:34:34 2011
@@ -24,6 +24,8 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.components.crypto.CryptoType;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.saml.SAMLKeyInfo;
import org.apache.ws.security.saml.SAMLUtil;
@@ -48,8 +50,10 @@ import org.opensaml.saml2.core.Issuer;
import org.opensaml.security.SAMLSignatureProfileValidator;
import org.opensaml.xml.XMLObject;
import org.opensaml.xml.security.x509.BasicX509Credential;
+import org.opensaml.xml.security.x509.X509KeyInfoGeneratorFactory;
import org.opensaml.xml.signature.KeyInfo;
import org.opensaml.xml.signature.Signature;
+import org.opensaml.xml.signature.SignatureConstants;
import org.opensaml.xml.signature.SignatureValidator;
import org.opensaml.xml.validation.ValidationException;
@@ -60,6 +64,8 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.IOException;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
@@ -224,9 +230,13 @@ public class AssertionWrapper {
}
samlVersion = samlCallbacks[0].getSamlVersion();
+ String issuer = samlCallbacks[0].getIssuer();
+ if (issuer == null && parms.getIssuer() != null) {
+ issuer = parms.getIssuer();
+ }
if (samlVersion.equals(SAMLVersion.VERSION_11)) {
// Build a SAML v1.1 assertion
- saml1 = SAML1ComponentBuilder.createSamlv1Assertion(parms.getIssuer());
+ saml1 = SAML1ComponentBuilder.createSamlv1Assertion(issuer);
try {
// Process the SAML authentication statement(s)
@@ -266,7 +276,7 @@ public class AssertionWrapper {
} else if (samlVersion.equals(SAMLVersion.VERSION_20)) {
// Build a SAML v2.0 assertion
saml2 = SAML2ComponentBuilder.createAssertion();
- Issuer issuer = SAML2ComponentBuilder.createIssuer(parms.getIssuer());
+ Issuer samlIssuer = SAML2ComponentBuilder.createIssuer(issuer);
// Authn Statement(s)
List<AuthnStatement> authnStatements =
@@ -290,7 +300,7 @@ public class AssertionWrapper {
saml2.getAuthzDecisionStatements().addAll(authDecisionStatements);
// Build the SAML v2.0 assertion
- saml2.setIssuer(issuer);
+ saml2.setIssuer(samlIssuer);
try {
org.opensaml.saml2.core.Subject subject =
@@ -485,6 +495,82 @@ public class AssertionWrapper {
log.error("Attempt to sign an unsignable object " + xmlObject.getClass().getName());
}
}
+
+ /**
+ * Create an enveloped signature on the assertion that has been created.
+ *
+ * @param issuerKeyName the Issuer KeyName to use with the issuerCrypto argument
+ * @param issuerKeyPassword the Issuer Password to use with the issuerCrypto argument
+ * @param issuerCrypto the Issuer Crypto instance
+ * @param sendKeyValue whether to send the key value or not
+ * @throws WSSecurityException
+ */
+ public void signAssertion(
+ String issuerKeyName,
+ String issuerKeyPassword,
+ Crypto issuerCrypto,
+ boolean sendKeyValue
+ ) throws WSSecurityException {
+ //
+ // Create the signature
+ //
+ Signature signature = OpenSAMLUtil.buildSignature();
+ signature.setCanonicalizationAlgorithm(
+ SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS
+ );
+
+ // prepare to sign the SAML token
+ CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
+ cryptoType.setAlias(issuerKeyName);
+ X509Certificate[] issuerCerts = issuerCrypto.getX509Certificates(cryptoType);
+ if (issuerCerts == null) {
+ throw new WSSecurityException(
+ "No issuer certs were found to sign the SAML Assertion using issuer name: "
+ + issuerKeyName
+ );
+ }
+
+ String sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1;
+ String pubKeyAlgo = issuerCerts[0].getPublicKey().getAlgorithm();
+ if (log.isDebugEnabled()) {
+ log.debug("automatic sig algo detection: " + pubKeyAlgo);
+ }
+ if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
+ sigAlgo = SignatureConstants.ALGO_ID_SIGNATURE_DSA;
+ }
+ PrivateKey privateKey = null;
+ try {
+ privateKey = issuerCrypto.getPrivateKey(issuerKeyName, issuerKeyPassword);
+ } catch (Exception ex) {
+ throw new WSSecurityException(ex.getMessage(), ex);
+ }
+
+ signature.setSignatureAlgorithm(sigAlgo);
+
+ BasicX509Credential signingCredential = new BasicX509Credential();
+ signingCredential.setEntityCertificate(issuerCerts[0]);
+ signingCredential.setPrivateKey(privateKey);
+
+ signature.setSigningCredential(signingCredential);
+
+ X509KeyInfoGeneratorFactory kiFactory = new X509KeyInfoGeneratorFactory();
+ if (sendKeyValue) {
+ kiFactory.setEmitPublicKeyValue(true);
+ } else {
+ kiFactory.setEmitEntityCertificate(true);
+ }
+ try {
+ KeyInfo keyInfo = kiFactory.newInstance().generate(signingCredential);
+ signature.setKeyInfo(keyInfo);
+ } catch (org.opensaml.xml.security.SecurityException ex) {
+ throw new WSSecurityException(
+ "Error generating KeyInfo from signing credential", ex
+ );
+ }
+
+ // add the signature to the assertion
+ setSignature(signature);
+ }
/**
* Verify the signature of this assertion
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/SAMLCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/SAMLCallback.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/SAMLCallback.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/SAMLCallback.java Thu Mar 24 15:34:34 2011
@@ -50,6 +50,11 @@ public class SAMLCallback implements Cal
private SubjectBean subject;
/**
+ * The issuer of the Assertion
+ */
+ private String issuer;
+
+ /**
* SAML Conditions representation
*/
private ConditionsBean conditions;
@@ -165,6 +170,24 @@ public class SAMLCallback implements Cal
}
/**
+ * Method getIssuer returns the issuer of this SAMLCallback object.
+ *
+ * @return the issuer of this SAMLCallback object.
+ */
+ public String getIssuer() {
+ return issuer;
+ }
+
+ /**
+ * Method setIssuer sets the issuer of this SAMLCallback object.
+ *
+ * @param issuer the issuer of this SAMLCallback object.
+ */
+ public void setIssuer(String issuer) {
+ this.issuer = issuer;
+ }
+
+ /**
* Method getConditions returns the conditions of this SAMLCallback object.
*
* @return the conditions (type ConditionsBean) of this SAMLCallback object.
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/AbstractSAMLCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/AbstractSAMLCallbackHandler.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/AbstractSAMLCallbackHandler.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/AbstractSAMLCallbackHandler.java Thu Mar 24 15:34:34 2011
@@ -57,6 +57,7 @@ public abstract class AbstractSAMLCallba
protected Statement statement = Statement.AUTHN;
protected CERT_IDENTIFIER certIdentifier = CERT_IDENTIFIER.X509_CERT;
protected byte[] ephemeralKey = null;
+ protected String issuer = null;
public void setConfirmationMethod(String confMethod) {
confirmationMethod = confMethod;
@@ -78,6 +79,10 @@ public abstract class AbstractSAMLCallba
return ephemeralKey;
}
+ public void setIssuer(String issuer) {
+ this.issuer = issuer;
+ }
+
/**
* Note that the SubjectBean parameter should be null for SAML2.0
*/
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java Thu Mar 24 15:34:34 2011
@@ -58,6 +58,7 @@ public class SAML1CallbackHandler extend
if (callbacks[i] instanceof SAMLCallback) {
SAMLCallback callback = (SAMLCallback) callbacks[i];
callback.setSamlVersion(SAMLVersion.VERSION_11);
+ callback.setIssuer(issuer);
SubjectBean subjectBean =
new SubjectBean(
subjectName, subjectQualifier, confirmationMethod
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java Thu Mar 24 15:34:34 2011
@@ -57,6 +57,7 @@ public class SAML2CallbackHandler extend
if (callbacks[i] instanceof SAMLCallback) {
SAMLCallback callback = (SAMLCallback) callbacks[i];
callback.setSamlVersion(SAMLVersion.VERSION_20);
+ callback.setIssuer(issuer);
SubjectBean subjectBean =
new SubjectBean(
subjectName, subjectQualifier, confirmationMethod
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java Thu Mar 24 15:34:34 2011
@@ -39,6 +39,7 @@ import org.apache.ws.security.message.WS
import org.apache.ws.security.message.WSSecSAMLToken;
import org.apache.ws.security.saml.ext.AssertionWrapper;
import org.apache.ws.security.saml.ext.SAMLCallback;
+import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.saml.ext.bean.SubjectBean;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
@@ -97,10 +98,11 @@ public class SamlNegativeTest extends or
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -148,14 +150,12 @@ public class SamlNegativeTest extends or
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -201,14 +201,12 @@ public class SamlNegativeTest extends or
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -249,14 +247,12 @@ public class SamlNegativeTest extends or
SAML1HOKNoKeyInfoCallbackHandler callbackHandler =
new SAML1HOKNoKeyInfoCallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -329,14 +325,15 @@ public class SamlNegativeTest extends or
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(CryptoFactory.getInstance("crypto.properties"));
- saml.setIssuerKeyName("16c73ab6-b892-458f-abf5-2f875f74882e");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion(
+ "16c73ab6-b892-458f-abf5-2f875f74882e", "security",
+ CryptoFactory.getInstance("crypto.properties"), false
+ );
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java Thu Mar 24 15:34:34 2011
@@ -37,6 +37,7 @@ import org.apache.ws.security.components
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.saml.ext.AssertionWrapper;
+import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.apache.ws.security.util.Loader;
@@ -96,10 +97,11 @@ public class SamlReferenceTest extends o
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -158,10 +160,11 @@ public class SamlReferenceTest extends o
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -221,14 +224,12 @@ public class SamlReferenceTest extends o
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -285,14 +286,12 @@ public class SamlReferenceTest extends o
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -403,14 +402,12 @@ public class SamlReferenceTest extends o
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -482,15 +479,12 @@ public class SamlReferenceTest extends o
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
-
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
Node assertionNode = assertion.toDOM(doc);
@@ -558,10 +552,11 @@ public class SamlReferenceTest extends o
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -619,10 +614,11 @@ public class SamlReferenceTest extends o
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -682,14 +678,12 @@ public class SamlReferenceTest extends o
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -746,14 +740,12 @@ public class SamlReferenceTest extends o
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -812,14 +804,12 @@ public class SamlReferenceTest extends o
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
@@ -890,14 +880,12 @@ public class SamlReferenceTest extends o
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java Thu Mar 24 15:34:34 2011
@@ -34,6 +34,7 @@ import org.apache.ws.security.components
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
import org.apache.ws.security.saml.ext.AssertionWrapper;
+import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -65,14 +66,12 @@ public class SamlTokenHOKTest extends or
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(crypto);
- saml.setIssuerKeyName("16c73ab6-b892-458f-abf5-2f875f74882e");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -139,14 +138,13 @@ public class SamlTokenHOKTest extends or
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(crypto);
- saml.setIssuerKeyName("16c73ab6-b892-458f-abf5-2f875f74882e");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -188,14 +186,13 @@ public class SamlTokenHOKTest extends or
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(crypto);
- saml.setIssuerKeyName("16c73ab6-b892-458f-abf5-2f875f74882e");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -229,14 +226,13 @@ public class SamlTokenHOKTest extends or
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(crypto);
- saml.setIssuerKeyName("16c73ab6-b892-458f-abf5-2f875f74882e");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e", "security", crypto, false);
+
WSSecSAMLToken wsSign = new WSSecSAMLToken();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java Thu Mar 24 15:34:34 2011
@@ -38,6 +38,7 @@ import org.apache.ws.security.handler.Re
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.saml.ext.AssertionWrapper;
+import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -71,10 +72,11 @@ public class SamlTokenSVTest extends org
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -185,10 +187,11 @@ public class SamlTokenSVTest extends org
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -244,11 +247,11 @@ public class SamlTokenSVTest extends org
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
-
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -303,10 +306,11 @@ public class SamlTokenSVTest extends org
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java Thu Mar 24 15:34:34 2011
@@ -37,6 +37,7 @@ import org.apache.ws.security.handler.WS
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
import org.apache.ws.security.saml.ext.AssertionWrapper;
+import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -66,10 +67,11 @@ public class SamlTokenTest extends org.j
public void testSAML1AuthnAssertion() throws Exception {
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -135,10 +137,11 @@ public class SamlTokenTest extends org.j
public void testSAML1AttrAssertion() throws Exception {
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.ATTR);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -171,10 +174,11 @@ public class SamlTokenTest extends org.j
public void testSAML1AuthzAssertion() throws Exception {
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHZ);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -207,10 +211,11 @@ public class SamlTokenTest extends org.j
public void testSAML2AuthnAssertion() throws Exception {
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -243,10 +248,11 @@ public class SamlTokenTest extends org.j
public void testSAML2AttrAssertion() throws Exception {
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.ATTR);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -279,10 +285,11 @@ public class SamlTokenTest extends org.j
public void testSAML2AuthzAssertion() throws Exception {
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHZ);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -359,10 +366,11 @@ public class SamlTokenTest extends org.j
public void testSAML1AuthnBadIssuerAssertion() throws Exception {
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example2.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example2.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -396,10 +404,11 @@ public class SamlTokenTest extends org.j
public void testSAML2AuthnBadIssuerAssertion() throws Exception {
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example2.com");
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example2.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java?rev=1085002&r1=1085001&r2=1085002&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java Thu Mar 24 15:34:34 2011
@@ -36,6 +36,7 @@ import org.apache.ws.security.components
import org.apache.ws.security.components.crypto.Merlin;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.saml.ext.AssertionWrapper;
+import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean.CERT_IDENTIFIER;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.saml.ext.builder.SAML2Constants;
@@ -90,14 +91,12 @@ public class SignedSamlTokenHOKTest exte
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -152,14 +151,12 @@ public class SignedSamlTokenHOKTest exte
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
byte[] ephemeralKey = callbackHandler.getEphemeralKey();
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
@@ -217,14 +214,12 @@ public class SignedSamlTokenHOKTest exte
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -279,14 +274,12 @@ public class SignedSamlTokenHOKTest exte
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
byte[] ephemeralKey = callbackHandler.getEphemeralKey();
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
@@ -348,14 +341,12 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setCertIdentifier(CERT_IDENTIFIER.X509_ISSUER_SERIAL);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -410,14 +401,12 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setCertIdentifier(CERT_IDENTIFIER.KEY_VALUE);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -472,14 +461,12 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setCertIdentifier(CERT_IDENTIFIER.KEY_VALUE);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ callbackHandler.setIssuer("www.example.com");
+
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("wss40", "security");
@@ -534,20 +521,17 @@ public class SignedSamlTokenHOKTest exte
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
+ callbackHandler.setIssuer("www.example.com");
Crypto crypto = CryptoFactory.getInstance("crypto.properties");
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
cryptoType.setAlias("16c73ab6-b892-458f-abf5-2f875f74882e");
X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
callbackHandler.setCerts(certs);
- SAMLIssuer saml = new SAMLIssuerImpl();
- saml.setIssuerName("www.example.com");
- saml.setIssuerCrypto(issuerCrypto);
- saml.setIssuerKeyName("wss40_server");
- saml.setIssuerKeyPassword("security");
- saml.setSignAssertion(true);
- saml.setCallbackHandler(callbackHandler);
- AssertionWrapper assertion = saml.newAssertion();
+ SAMLParms samlParms = new SAMLParms();
+ samlParms.setCallbackHandler(callbackHandler);
+ AssertionWrapper assertion = new AssertionWrapper(samlParms);
+ assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
wsSign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");