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 2012/08/20 17:40:46 UTC
svn commit: r1375068 [2/2] - in /webservices/wss4j/trunk:
streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/
streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/
streaming-ws-security/sr...
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java?rev=1375068&r1=1375067&r2=1375068&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java Mon Aug 20 15:40:44 2012
@@ -82,7 +82,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -111,39 +111,6 @@ public class SamlTokenTest extends org.j
}
/**
- * Test that creates, sends and processes an unsigned SAML 1 authentication assertion, where
- * the configuration is loaded from a properties file
- */
- @org.junit.Test
- public void testSAML1AuthnAssertionFromProperties() throws Exception {
- SAMLIssuer saml = SAMLIssuerFactory.getInstance("saml_sv.properties");
- AssertionWrapper assertion = saml.newAssertion();
-
- WSSecSAMLToken wsSign = new WSSecSAMLToken();
-
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
-
- Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
- String outputString =
- XMLUtils.PrettyDocumentToString(unsignedDoc);
- LOG.debug(outputString);
- }
-
- 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());
- }
-
- /**
* Test that creates, sends and processes an unsigned SAML 1.1 authentication assertion.
* It set a DOM Element on the CallbackHandler rather than creating a set of beans for
* AssertionWrapper to parse.
@@ -154,7 +121,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -192,7 +159,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -230,7 +197,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setResource("http://resource.org");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -267,7 +234,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -304,7 +271,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -341,7 +308,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setResource("http://resource.org");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -379,7 +346,7 @@ public class SamlTokenTest extends org.j
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
java.util.Map<String, Object> config = new java.util.TreeMap<String, Object>();
- config.put(WSHandlerConstants.SAML_PROP_FILE, "saml_sv.properties");
+ config.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
reqData.setMsgContext(config);
final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
@@ -422,7 +389,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example2.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -460,7 +427,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setIssuer("www.example2.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -498,7 +465,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setSubjectNameIDFormat(SAML1Constants.NAMEID_FORMAT_EMAIL_ADDRESS);
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -538,7 +505,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setSubjectNameIDFormat(SAML1Constants.NAMEID_FORMAT_EMAIL_ADDRESS);
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -578,7 +545,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setSubjectLocality("12.34.56.780", "test-dns");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -619,7 +586,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setSubjectLocality("12.34.56.780", "test-dns");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -660,7 +627,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setResource("http://resource.org");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -716,7 +683,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setCustomAttributeValues(Collections.singletonList(attributeValue));
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
@@ -761,7 +728,7 @@ public class SamlTokenTest extends org.j
callbackHandler.setSubjectConfirmationData(subjectConfirmationData);
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
WSSecSAMLToken wsSign = new WSSecSAMLToken();
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java?rev=1375068&r1=1375067&r2=1375068&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java Mon Aug 20 15:40:44 2012
@@ -95,7 +95,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -157,7 +157,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -221,7 +221,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -282,7 +282,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -350,7 +350,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -411,7 +411,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -472,7 +472,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
@@ -538,7 +538,7 @@ public class SignedSamlTokenHOKTest exte
callbackHandler.setCerts(certs);
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("wss40_server", "security", issuerCrypto, false);
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/ext/AssertionSigningTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/ext/AssertionSigningTest.java?rev=1375068&r1=1375067&r2=1375068&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/ext/AssertionSigningTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/ext/AssertionSigningTest.java Mon Aug 20 15:40:44 2012
@@ -80,7 +80,7 @@ public class AssertionSigningTest extend
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("client_certchain", "password", issuerCrypto,
@@ -107,7 +107,7 @@ public class AssertionSigningTest extend
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
assertion.signAssertion("client_certchain", "password", issuerCrypto,
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/validate/ValidatorTest.java?rev=1375068&r1=1375067&r2=1375068&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/validate/ValidatorTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/validate/ValidatorTest.java Mon Aug 20 15:40:44 2012
@@ -292,7 +292,7 @@ public class ValidatorTest extends org.j
callbackHandler.setIssuer("www.example.com");
SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback, null);
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
AssertionWrapper assertion = new AssertionWrapper(samlCallback);
credential.setTransformedToken(assertion);