You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2011/03/30 12:20:14 UTC
svn commit: r1086895 [2/2] - in /cxf/trunk/rt/ws/security/src:
main/java/org/apache/cxf/ws/security/policy/
main/java/org/apache/cxf/ws/security/policy/builders/
main/java/org/apache/cxf/ws/security/policy/model/
main/java/org/apache/cxf/ws/security/ws...
Copied: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java (from r1086519, cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SAML1CallbackHandler.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java?p2=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java&p1=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SAML1CallbackHandler.java&r1=1086519&r2=1086895&rev=1086895&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SAML1CallbackHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java Wed Mar 30 10:20:13 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.ws.security.wss4j;
+package org.apache.cxf.ws.security.wss4j.saml;
import java.io.IOException;
Copied: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java (from r1086519, cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SAML2CallbackHandler.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java?p2=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java&p1=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SAML2CallbackHandler.java&r1=1086519&r2=1086895&rev=1086895&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SAML2CallbackHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java Wed Mar 30 10:20:13 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.ws.security.wss4j;
+package org.apache.cxf.ws.security.wss4j.saml;
import java.io.IOException;
Copied: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java (from r1086519, cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SamlTokenTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java?p2=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java&p1=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SamlTokenTest.java&r1=1086519&r2=1086895&rev=1086895&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SamlTokenTest.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java Wed Mar 30 10:20:13 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.ws.security.wss4j;
+package org.apache.cxf.ws.security.wss4j.saml;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -47,6 +47,10 @@ import org.apache.cxf.message.ExchangeIm
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.ws.security.wss4j.AbstractSecurityTest;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -77,7 +81,7 @@ public class SamlTokenTest extends Abstr
outProperties.put(WSHandlerConstants.SAML_PROP_FILE, "saml_sv.properties");
outProperties.put(
WSHandlerConstants.SAML_CALLBACK_CLASS,
- "org.apache.cxf.ws.security.wss4j.SAML1CallbackHandler"
+ "org.apache.cxf.ws.security.wss4j.saml.SAML1CallbackHandler"
);
Map<String, Object> inProperties = new HashMap<String, Object>();
@@ -113,7 +117,7 @@ public class SamlTokenTest extends Abstr
outProperties.put(WSHandlerConstants.SAML_PROP_FILE, "saml_sv.properties");
outProperties.put(
WSHandlerConstants.SAML_CALLBACK_CLASS,
- "org.apache.cxf.ws.security.wss4j.SAML2CallbackHandler"
+ "org.apache.cxf.ws.security.wss4j.saml.SAML2CallbackHandler"
);
Map<String, Object> inProperties = new HashMap<String, Object>();
Added: cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml?rev=1086895&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml Wed Mar 30 10:20:13 2011
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ xmlns:ser="http://www.sdj.pl">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SignedSupportingTokens
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:SamlToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssSamlV20Token11/>
+ </wsp:Policy>
+ </sp:SamlToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
Added: cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_request.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_request.xml?rev=1086895&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_request.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_request.xml Wed Mar 30 10:20:13 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <soap:Header>
+ <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+ <saml2:Assertion ID="4D2CF5C052E2084C8F13014023747597" IssueInstant="2011-03-29T12:39:34.759Z" Version="2.0" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="saml2:AssertionType"><saml2:Issuer>www.example.com</saml2:Issuer><saml2:Subject><saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" NameQualifier="www.example.com">uid=joe,ou=people,ou=saml-demo,o=example.com</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:sender-vouches"><saml2:SubjectConfirmationData/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2011-03-29T12:39:34.763Z" NotOnOrAfter="2011-03-29T12:44:34.763Z"/><saml2:AuthzDecisionStatement Decision="Permit" Resource="endpoint"><saml2:Action>Read</saml2:Action></saml2:AuthzDecisionStatement></saml2:Assertion>
+ </wsse:Security>
+ </soap:Header>
+ <soap:Body>
+ <echo xmlns="http://www.sdj.pl">
+ <in0>A</in0>
+ </echo>
+ </soap:Body>
+</soap:Envelope>
Added: cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_assertion_policy.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_assertion_policy.xml?rev=1086895&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_assertion_policy.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_assertion_policy.xml Wed Mar 30 10:20:13 2011
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ xmlns:ser="http://www.sdj.pl">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SupportingTokens
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:SamlToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssSamlV11Token11/>
+ </wsp:Policy>
+ </sp:SamlToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
Added: cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_request.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_request.xml?rev=1086895&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_request.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml_request.xml Wed Mar 30 10:20:13 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <soap:Header>
+ <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+ <saml1:Assertion AssertionID="4D2CF5C052E2084C8F13014023748318" IssueInstant="2011-03-29T12:39:34.831Z" Issuer="www.example.com" MajorVersion="1" MinorVersion="1" xmlns:saml1="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="saml1:AssertionType"><saml1:ConditionsType NotBefore="2011-03-29T12:39:34.832Z" NotOnOrAfter="2011-03-29T12:44:34.832Z"/><saml1:AuthenticationStatement AuthenticationInstant="2011-03-29T12:39:34.831Z" AuthenticationMethod="urn:oasis:names:tc:SAML:1.0:am:password" xsi:type="saml1:AuthenticationStatementType"><saml1:Subject><saml1:NameIdentifier Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" NameQualifier="www.example.com">uid=joe,ou=people,ou=saml-demo,o=example.com</saml1:NameIdentifier><saml1:SubjectConfirmation><saml1:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:sender-vouches</saml1:ConfirmationMethod></saml1:SubjectConfirmation></saml1:Subject></saml1:AuthenticationStatement
></saml1:Assertion>
+ </wsse:Security>
+ </soap:Header>
+ <soap:Body>
+ <echo xmlns="http://www.sdj.pl">
+ <in0>A</in0>
+ </echo>
+ </soap:Body>
+</soap:Envelope>
Added: cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/wsse-request-clean.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/wsse-request-clean.xml?rev=1086895&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/wsse-request-clean.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/wsse-request-clean.xml Wed Mar 30 10:20:13 2011
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <soap:Header>
+ <Header xmlns="http://www.sdj.pl">1234</Header>
+ <Header xmlns="http://www.sdj.pl">5678</Header>
+ </soap:Header>
+ <soap:Body>
+ <echo xmlns="http://www.sdj.pl">
+ <in0 xmlns="http://www.sdj.pl">A</in0>
+ </echo>
+ </soap:Body>
+</soap:Envelope>
\ No newline at end of file