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 2015/04/15 11:15:31 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 1d03ca5c0 -> 97682e60c
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/97682e60
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/97682e60
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/97682e60
Branch: refs/heads/3.0.x-fixes
Commit: 97682e60cadb251ea47fd89917fc03a6b1ffd020
Parents: 6a41413
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 15 10:15:22 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 15 10:15:22 2015 +0100
----------------------------------------------------------------------
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/97682e60/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9457d03..1e10dfc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -89,6 +89,7 @@ B 4fe7844935f9b4ad797760613d143949f9448905
B 504b427081cfc2213ce0a5c050b16af67ca7ff46
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 55bda33699ea1c2e84a125253edd594cc2a32ea3
+B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e
B 5891c0d23b776d41be02e74a3b98a3881970d08f
B 593525139909e081ae809278d301688c0ba03697
B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23
@@ -96,6 +97,7 @@ B 5bac26a132e7999bf0bd108d4cffb674873a56ca
B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0
B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
B 5f94e273e7e8d99915eeda1189824f13488eb013
+B 5faf182264c64bd3c0abc0addc9746b64492c864
B 5fbd407bac5af5e55bb280125405d75b7add872b
B 5fc6229a6d289a6a4f23fac4f1d7750285c85d1a
B 6168d90fab71f2a8811640bfbbf88bfd1eed1848
@@ -116,7 +118,9 @@ B 702f27bc4a334b2d117262252632bf580f20f711
B 71488c6fa7635c88285214a0479379aafef9ed3c
B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c
B 71ced4709dedf62264a4bb630aaf4780cb94ce48
+B 71e9ada9b119ad8d960b9be15bc5689d718273ef
B 72ba5f34d674012e2f8ca8ef5add0b022235ee06
+B 731d7df1181d717e2dc867c9e00118f974de6179
B 7456089088a21620ec75dc83fbb4b89ebdfd290e
B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79
@@ -192,6 +196,7 @@ B ba293c6e7456e80a5fe92f25a4893d3e45380bf0
B ba2d7b85d44970cb4abd8cd18ac24178394ef404
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
+B bc752dc5bd89b5d70d00435fc1185e72659d7e4d
B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
B bea22d764138e365513856c23be760a7719530a0
@@ -199,6 +204,7 @@ B bef3d8408feb07365e17ca6960db7b4b2f1436ec
B bf6bba1082d030298df9b9f1c354da5f92833eae
B bfbc0a25c377e43395fb1f7beee045e4412c4d8d
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
+B c04c27200226b564108b4fe58b8ac70ca5ec7638
B c1c9562bb13eeacdd9dae5a46c513e9e03625698
B c4c969042edcbcd439faa0fc95c1f5130cf06c71
B c5609a479c87ea75e016b61daeafe0021f693332
@@ -228,6 +234,7 @@ B e441a15af9413bfb24ee1b4ce78e01bf543fc148
B e4b2e746d6a70d02f64daab7aca79142e62709ca
B e548a02fa04313fd1b6ec5d9ac78c774e8ad935a
B e5637ffcc3a56923982c4254cffe54cc62130ee9
+B e5d98fd24b545920f2453e94a56cd9690582af59
B e6fc7e50266d45c8b5afb002abdc44b69585cc69
B e8514ea3f5fdf33b19d9ddc0639cc1aaf57e1f62
B e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64
[2/2] cxf git commit: [CXF-6327] - Adding @Ignore'd test
Posted by co...@apache.org.
[CXF-6327] - Adding @Ignore'd test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6a41413e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6a41413e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6a41413e
Branch: refs/heads/3.0.x-fixes
Commit: 6a41413eaf53441ad56d10bfa28867bc2ad553de
Parents: 1d03ca5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 15 10:13:25 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 15 10:15:22 2015 +0100
----------------------------------------------------------------------
.../sts/transport/TransportBindingTest.java | 31 +++++++
.../cxf/systest/sts/transport/DoubleIt.wsdl | 97 ++++++++++++++++++++
.../cxf/systest/sts/transport/cxf-client.xml | 8 ++
.../cxf/systest/sts/transport/cxf-service.xml | 6 ++
.../systest/sts/transport/cxf-stax-service.xml | 8 ++
5 files changed, 150 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 33076b5..ba23de9 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -378,6 +378,37 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+ // TODO Not supported for now
+ @org.junit.Test
+ @org.junit.Ignore
+ public void testSAML2EndorsingX509() throws Exception {
+
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ SpringBusFactory.setDefaultBus(bus);
+ SpringBusFactory.setThreadDefaultBus(bus);
+
+ URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
+ Service service = Service.create(wsdl, SERVICE_QNAME);
+ QName portQName = new QName(NAMESPACE, "DoubleItTransportSAML2X509EndorsingPort");
+ DoubleItPortType transportSaml1Port =
+ service.getPort(portQName, DoubleItPortType.class);
+ updateAddressPort(transportSaml1Port, test.getPort());
+
+ TokenTestUtils.updateSTSPort((BindingProvider)transportSaml1Port, test.getStsPort());
+
+ if (test.isStreaming()) {
+ SecurityTestUtil.enableStreaming(transportSaml1Port);
+ }
+
+ doubleIt(transportSaml1Port, 25);
+
+ ((java.io.Closeable)transportSaml1Port).close();
+ bus.shutdown(true);
+ }
+
private DOMSource createDOMRequest() throws ParserConfigurationException {
// Creating a DOMSource Object for the request
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
index 2f0e12a..d08b102 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
@@ -64,6 +64,21 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
+ <wsdl:binding name="DoubleItTransportSAML2X509EndorsingBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItBindingTransportSAML2X509EndorsingPolicy"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
<wsdl:service name="DoubleItService">
<wsdl:port name="DoubleItTransportSAML1Port" binding="tns:DoubleItTransportSAML1Binding">
<soap:address location="https://localhost:8081/doubleit/services/doubleittransportsaml1"/>
@@ -74,6 +89,10 @@
<wsdl:port name="DoubleItTransportSAML1EndorsingPort" binding="tns:DoubleItTransportSAML1EndorsingBinding">
<soap:address location="https://localhost:8081/doubleit/services/doubleittransportsaml1endorsing"/>
</wsdl:port>
+ <wsdl:port name="DoubleItTransportSAML2X509EndorsingPort"
+ binding="tns:DoubleItTransportSAML2X509EndorsingBinding">
+ <soap:address location="https://localhost:8081/doubleit/services/doubleittransportsaml2x509endorsing"/>
+ </wsdl:port>
</wsdl:service>
<wsp:Policy wsu:Id="DoubleItBindingTransportSAML1Policy">
<wsp:ExactlyOne>
@@ -277,6 +296,84 @@
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItBindingTransportSAML2X509EndorsingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsam:Addressing wsp:Optional="false">
+ <wsp:Policy/>
+ </wsam:Addressing>
+ <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDes/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <sp:RequestSecurityTokenTemplate>
+ <t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
+ <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</t:KeyType>
+ </sp:RequestSecurityTokenTemplate>
+ <wsp:Policy>
+ <sp:RequireInternalReference/>
+ </wsp:Policy>
+ <sp:Issuer>
+ <wsaw:Address>http://localhost:8080/STS/STSUT
+ </wsaw:Address>
+ <wsaw:Metadata>
+ <wsx:Metadata>
+ <wsx:MetadataSection>
+ <wsx:MetadataReference>
+ <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
+ </wsaw:Address>
+ </wsx:MetadataReference>
+ </wsx:MetadataSection>
+ </wsx:Metadata>
+ </wsaw:Metadata>
+ </sp:Issuer>
+ </sp:IssuedToken>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ <sp:RequireIssuerSerialReference/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust13>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust13>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
<wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy">
<wsp:ExactlyOne>
<wsp:All>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
index 41291d0..c59cd96 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
@@ -72,6 +72,14 @@
<entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2X509EndorsingPort" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.username" value="myclientkey"/>
+ <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ </jaxws:properties>
+ </jaxws:client>
<http:conduit name="https://localhost.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="ckpass">
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
index e536204..a5dbcc4 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
@@ -45,6 +45,12 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2x509" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2X509EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2x509endorsing" wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+ </jaxws:properties>
+ </jaxws:endpoint>
<httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
<httpj:engine port="${testutil.ports.Server}">
<httpj:tlsServerParameters>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
index b48b8dc..f9d7a0c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
@@ -48,6 +48,14 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2x509endorsing" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2X509EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2x509endorsing" wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
+ <entry key="ws-security.enable.streaming" value="true"/>
+ </jaxws:properties>
+ </jaxws:endpoint>
<httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
<httpj:engine port="${testutil.ports.StaxServer}">
<httpj:tlsServerParameters>