Repository: cxf Updated Branches: refs/heads/master 3aec3e286 -> 9d2f604fc
Adding another spnego test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9d2f604f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9d2f604f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9d2f604f Branch: refs/heads/master Commit: 9d2f604fc57b874ebdc9ddc312b1e1555f64033e Parents: 514e7c1 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Feb 4 11:28:33 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Feb 4 11:28:55 2015 +0000 ---------------------------------------------------------------------- .../kerberos/wssec/spnego/SpnegoTokenTest.java | 14 ++++++++ .../kerberos/wssec/spnego/DoubleItSpnego.wsdl | 35 ++++++++++++++++---- .../systest/kerberos/wssec/spnego/client.xml | 7 ++++ .../systest/kerberos/wssec/spnego/server.xml | 6 ++++ .../kerberos/wssec/spnego/stax-server.xml | 7 ++++ 5 files changed, 62 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9d2f604f/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java index ff4e120..90280b2 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java @@ -246,6 +246,20 @@ public class SpnegoTokenTest extends AbstractLdapTestUnit { // runKerberosTest(portName, true, PORT2); // runKerberosTest(portName, true, STAX_PORT2); } + + @org.junit.Test + public void testSpnegoOverTransportEndorsingSP11() throws Exception { + if (!runTests || !unrestrictedPoliciesInstalled) { + return; + } + + String portName = "DoubleItSpnegoTransportEndorsingSP11Port"; + runKerberosTest(portName, false, PORT2); + runKerberosTest(portName, false, STAX_PORT2); + // TODO Supporting streaming Spnego outbound + // runKerberosTest(portName, true, PORT2); + // runKerberosTest(portName, true, STAX_PORT2); + } @org.junit.Test @org.junit.Ignore http://git-wip-us.apache.org/repos/asf/cxf/blob/9d2f604f/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl index a318642..c68eee8 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl @@ -109,6 +109,24 @@ </wsdl:fault> </wsdl:operation> </wsdl:binding> + <wsdl:binding name="DoubleItSpnegoTransportEndorsingSP11Binding" type="tns:DoubleItPortType"> + <wsp:PolicyReference URI="#DoubleItSpnegoTransportEndorsingSP11Policy"/> + <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:fault name="DoubleItFault"> + <soap:body use="literal" name="DoubleItFault"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> <wsdl:binding name="DoubleItSpnegoSymmetricSecureConversationBinding" type="tns:DoubleItPortType"> <wsp:PolicyReference URI="#DoubleItSpnegoSymmetricSecureConversationPolicy"/> <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> @@ -143,6 +161,9 @@ <wsdl:port name="DoubleItSpnegoTransportEndorsingPort" binding="tns:DoubleItSpnegoTransportEndorsingBinding"> <soap:address location="https://localhost:9001/DoubleItSpnegoTransportEndorsing"/> </wsdl:port> + <wsdl:port name="DoubleItSpnegoTransportEndorsingSP11Port" binding="tns:DoubleItSpnegoTransportEndorsingSP11Binding"> + <soap:address location="https://localhost:9001/DoubleItSpnegoTransportEndorsingSP11"/> + </wsdl:port> <wsdl:port name="DoubleItSpnegoSymmetricSecureConversationPort" binding="tns:DoubleItSpnegoSymmetricSecureConversationBinding"> <soap:address location="http://localhost:9001/DoubleItSpnegoSymmetricSecureConversation"/> </wsdl:port> @@ -302,7 +323,7 @@ </wsp:All> </wsp:ExactlyOne> </wsp:Policy> - <wsp:Policy wsu:Id="DoubleItSpnegoTransportPolicy"> + <wsp:Policy wsu:Id="DoubleItSpnegoTransportEndorsingPolicy"> <wsp:ExactlyOne> <wsp:All> <sp:TransportBinding> @@ -327,13 +348,13 @@ </sp:AlgorithmSuite> </wsp:Policy> </sp:TransportBinding> - <sp:SupportingTokens> + <sp:EndorsingSupportingTokens> <wsp:Policy> <sp:SpnegoContextToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";> <wsp:Policy /> </sp:SpnegoContextToken> </wsp:Policy> - </sp:SupportingTokens> + </sp:EndorsingSupportingTokens> <sp:Wss11> <wsp:Policy> <sp:MustSupportRefIssuerSerial/> @@ -344,10 +365,10 @@ </wsp:All> </wsp:ExactlyOne> </wsp:Policy> - <wsp:Policy wsu:Id="DoubleItSpnegoTransportEndorsingPolicy"> + <wsp:Policy wsu:Id="DoubleItSpnegoTransportEndorsingSP11Policy"> <wsp:ExactlyOne> <wsp:All> - <sp:TransportBinding> + <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> <wsp:Policy> <sp:TransportToken> <wsp:Policy> @@ -369,9 +390,9 @@ </sp:AlgorithmSuite> </wsp:Policy> </sp:TransportBinding> - <sp:EndorsingSupportingTokens> + <sp:EndorsingSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> <wsp:Policy> - <sp:SpnegoContextToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";> + <sp:SpnegoContextToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once";> <wsp:Policy /> </sp:SpnegoContextToken> </wsp:Policy> http://git-wip-us.apache.org/repos/asf/cxf/blob/9d2f604f/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml index 136bd0a..39f4e70 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml @@ -64,6 +64,13 @@ <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> + <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoTransportEndorsingSP11Port"; createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.kerberos.jaas.context" value="alice"/> + <entry key="ws-security.kerberos.spn" value="[email protected]"/> + <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + </jaxws:properties> + </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoSymmetricSecureConversationPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9d2f604f/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml index 8b575d8..ebf665b 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml @@ -77,6 +77,12 @@ <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransportEndorsingSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings"> + <jaxws:properties> + <entry key="ws-security.kerberos.jaas.context" value="bob"/> + <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + </jaxws:properties> + </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SpnegoOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricSecureConversationPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="bob"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9d2f604f/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml index 72c639b..0b5defe 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml @@ -82,4 +82,11 @@ <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransportEndorsingSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings"> + <jaxws:properties> + <entry key="ws-security.kerberos.jaas.context" value="bob"/> + <entry key="ws-security.enable.streaming" value="true"/> + <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + </jaxws:properties> + </jaxws:endpoint> </beans>
