[jbossws-commits] JBossWS SVN: r18500 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 5 other directories.

Author: rsearls Date: 2014-03-12 15:30:43 -0400 (Wed, 12 Mar 2014) New Revision: 18500 Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3738] working bearer test. Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-12 19:30:43 UTC (rev 18500) @@ -570,7 +570,6 @@ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> <include name="wsdl/Bearer*"/> @@ -579,13 +578,6 @@ <include name="servicestore.jks" /> <include name="serviceKeystore.properties" /> </zipfileset> - - <!-- rls start test - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> - <include name="xclientstore.jks" /> - <include name="xclientKeystore.properties" /> - </zipfileset> - - rls end test --> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> </manifest> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 19:30:43 UTC (rev 18500) @@ -24,6 +24,7 @@ import java.net.URL; import java.security.KeyStore; import java.security.KeyStoreException; +import java.util.HashMap; import java.util.Map; import javax.xml.namespace.QName; @@ -64,65 +65,57 @@ */ public class WSTrustBearerTestCase extends JBossWSTest { - private final String httpsserviceURL = "https://" + getServerHost() + private final String serviceURL = "https://" + getServerHost() + ":8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"; - private final String serviceURL = "http://" + getServerHost() - + ":8080/jaxws-samples-wsse-policy-trust-bearer/BearerService"; - public static Test suite() { - // NOTE skip setting up security-domain in server config. This was done manually. - JBossWSCXFTestSetup testSetup = new JBossWSCXFTestSetup(WSTrustBearerTestCase.class, - "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war"); + //deploy client, STS and service; start a security domain to be used by the STS for authenticating client + JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustBearerTestCase.class, + "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war"); + // setup the https connector in the server config file. + Map<String, String> sslOptions = new HashMap<String, String>(); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + else + { + sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("server-identity.ssl.keystore-password", "changeit"); + sslOptions.put("server-identity.ssl.alias", "tomcat"); + } + + testSetup.setHttpsConnectorRequirement(sslOptions); return testSetup; } - public void testAllInOneBearer() throws Exception + public void testBearer() throws Exception { Bus bus = BusFactory.newInstance().createBus(); try { - String tmpServiceURL = httpsserviceURL; //serviceURL - - setHTTPConduit(tmpServiceURL, bus); + // Must create and register conduit for https before creating service + // and set in bus before setting default bus. + setHTTPConduit(serviceURL, bus); BusFactory.setThreadDefaultBus(bus); - - //------------------------------ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypo...;, "BearerService"); - final URL wsdlURL = new URL(tmpServiceURL + "?wsdl"); + final URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); BearerIface proxy = (BearerIface) service.getPort(BearerIface.class); - Map<String, Object> ctx = ((BindingProvider)proxy).getRequestContext(); + WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus); + assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello()); - STSClient stsClient = new STSClient(bus); - - ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); - ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); - ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); - ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey"); - ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey"); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice"); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler()); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey"); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey"); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); - ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true"); - - ctx.put(SecurityConstants.STS_CLIENT, stsClient); - - - proxy.sayHello(); - } catch(Exception e){ - e.printStackTrace(); - assertTrue(false); + assertTrue("Failed test setup of conduit.", false); } } @@ -136,8 +129,8 @@ endpointInfo.getTarget()); TLSClientParameters tlsParams = new TLSClientParameters(); - tlsParams.setSecureSocketProtocol("SSL"); //TLSv1 // SSL .. try this - setKeyManagers(tlsParams, "ckpass", "META-INF/clientstore.jks"); + tlsParams.setSecureSocketProtocol("SSL"); + setKeyManagers(tlsParams, "ckpass", "cspass", "META-INF/clientstore.jks"); tlsParams.setDisableCNCheck(true); httpConduit.setTlsClientParameters(tlsParams); @@ -145,19 +138,16 @@ JBossWSConfigurer configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class); BeanCustomizer customizer = configurer.getCustomizer(); customizer.customize(httpConduit); - } - private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams, - String keyPassword, String keyStoreLoc) - throws KeyStoreException, Exception { + private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams, String keyPassword, + String keyStorePasswd, String keyStoreLoc) throws Exception { - keyStoreLoc = "META-INF/clientstore.jks"; InputStream inStream = Thread.currentThread().getContextClassLoader() .getResourceAsStream(keyStoreLoc); KeyStore keyStore = KeyStore.getInstance("JKS"); - keyStore.load(inStream, "cspass".toCharArray()); + keyStore.load(inStream, keyStorePasswd.toCharArray()); inStream.close(); @@ -167,13 +157,13 @@ : null; KeyManagerFactory keyMF = KeyManagerFactory.getInstance(alg); keyMF.init(keyStore, keyPass); - KeyManager[] myKeyManagers = keyMF.getKeyManagers(); + KeyManager[] myKeyManagers = keyMF.getKeyManagers(); tlsParams.setKeyManagers(myKeyManagers); inStream = Thread.currentThread().getContextClassLoader() .getResourceAsStream(keyStoreLoc); KeyStore trustStore = KeyStore.getInstance("JKS"); - trustStore.load(inStream, "cspass".toCharArray()); + trustStore.load(inStream, keyStorePasswd.toCharArray()); inStream.close(); TrustManagerFactory trustMF = TrustManagerFactory.getInstance(alg); trustMF.init(trustStore); @@ -182,11 +172,4 @@ return tlsParams; } - - - private static String appendIssuedTokenSuffix(String prop) - { - return prop + ".it"; - } - } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-12 19:30:43 UTC (rev 18500) @@ -21,22 +21,20 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.trust; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; - import org.apache.cxf.Bus; import org.apache.cxf.ws.security.SecurityConstants; -import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.trust.STSClient; +import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface; import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler; import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.UsernameTokenCallbackHandler; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import java.util.HashMap; +import java.util.Map; + /** * Some client util methods for WS-Trust testcases * @@ -205,16 +203,20 @@ STSClient stsClient = new STSClient(bus); - Map<String, Object> props = stsClient.getProperties(); - props.put(SecurityConstants.USERNAME, "alice"); - props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); - props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey"); - props.put(SecurityConstants.STS_TOKEN_PROPERTIES, - Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); - props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true"); + ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); + ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey"); + ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler()); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true"); ctx.put(SecurityConstants.STS_CLIENT, stsClient); - } private static String appendIssuedTokenSuffix(String prop) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java 2014-03-12 19:30:43 UTC (rev 18500) @@ -1,42 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer; - -import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler; - -import java.util.HashMap; -import java.util.Map; - -public class BearerCallbackHandler extends PasswordCallbackHandler -{ - - public BearerCallbackHandler() - { - super(getInitMap()); - } - - private static Map<String, String> getInitMap() - { - Map<String, String> passwords = new HashMap<String, String>(); - passwords.put("myservicekey", "skpass"); - - passwords.put("myclientkey", "ckpass"); // rls added - return passwords; - } -} Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-12 19:30:43 UTC (rev 18500) @@ -23,12 +23,8 @@ import org.apache.cxf.annotations.EndpointProperties; import org.apache.cxf.annotations.EndpointProperty; -import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface; import javax.jws.WebService; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.ServletSecurity.TransportGuarantee; @WebService ( @@ -39,17 +35,8 @@ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface" ) @EndpointProperties(value = { - @EndpointProperty(key = "ws-security.is-bsp-compliant", value = "false"), - //- @EndpointProperty(key = "ws-security.signature.username", value = "myservicekey" ), - @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties"), - //- @EndpointProperty(key = "ws-security.encryption.properties", value = "serviceKeystore.properties"), - @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerCallbackHandler") + @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties") }) -/** -@ServletSecurity( - @HttpConstraint(transportGuarantee = TransportGuarantee.CONFIDENTIAL - )) - **/ public class BearerImpl implements BearerIface { public String sayHello() Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java 2014-03-12 19:30:43 UTC (rev 18500) @@ -34,7 +34,6 @@ { Map<String, String> passwords = new HashMap<String, String>(); passwords.put("mystskey", "stskpass"); - passwords.put("myclientkey", "ckpass"); passwords.put("alice", "clarinet"); return passwords; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-12 19:30:43 UTC (rev 18500) @@ -26,13 +26,11 @@ import org.apache.cxf.sts.StaticSTSProperties; import org.apache.cxf.sts.operation.TokenIssueOperation; import org.apache.cxf.sts.operation.TokenValidateOperation; -import org.apache.cxf.sts.service.EncryptionProperties; import org.apache.cxf.sts.service.ServiceMBean; import org.apache.cxf.sts.service.StaticService; import org.apache.cxf.sts.token.delegation.HOKDelegationHandler; import org.apache.cxf.sts.token.provider.SAMLTokenProvider; import org.apache.cxf.sts.token.validator.SAMLTokenValidator; -import org.apache.cxf.ws.security.policy.SPConstants; import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider; import javax.xml.ws.WebServiceProvider; @@ -68,12 +66,9 @@ List<ServiceMBean> services = new LinkedList<ServiceMBean>(); StaticService service = new StaticService(); service.setEndpoints(Arrays.asList( - // for STS testing only - "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/myBearerService.*", - // bearer serivce addresses - "http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService", - "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService", - "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService" + "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService", + "https://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService", + "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService" )); services.add(service); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml 2014-03-12 19:30:43 UTC (rev 18500) @@ -12,17 +12,4 @@ <servlet-name>TestSecurityTokenService</servlet-name> <url-pattern>/SecurityTokenService/*</url-pattern> </servlet-mapping> - <!-- - <security-constraint> - <web-resource-collection> - <web-resource-name>restricted web services</web-resource-name> - <url-pattern>/*</url-pattern> - <http-method>GET</http-method> - <http-method>POST</http-method> - </web-resource-collection> - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - </security-constraint> - --> </web-app> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-12 19:30:43 UTC (rev 18500) @@ -5,8 +5,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsp="http://www.w3.org/ns/ws-policy" - xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" @@ -38,22 +38,15 @@ <soap:operation soapAction=""/> <input> <soap:body use="literal"/> - <!-- - <wsp:PolicyReference URI="#Input_Policy" />--> - </input> <output> <soap:body use="literal"/> - <!-- - <wsp:PolicyReference URI="#Output_Policy" />--> - </output> </operation> </binding> <service name="BearerService"> <port name="BearerServicePort" binding="tns:BearerServicePortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"/> - </port> </service> @@ -64,7 +57,7 @@ <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> @@ -102,17 +95,18 @@ <sp:RequireInternalReference /> </wsp:Policy> + <sp:Issuer> + <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address> + <wsaws:Metadata + xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" + wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> + <wsaw:ServiceName + xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" + xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" + EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> + </wsaws:Metadata> + </sp:Issuer> - <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address> - <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> - <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" - xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" - EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> - </wsaws:Metadata> - </sp:Issuer> - </sp:IssuedToken> </wsp:Policy> </sp:SignedSupportingTokens> @@ -134,6 +128,4 @@ </wsp:ExactlyOne> </wsp:Policy> - - </definitions> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-12 19:30:43 UTC (rev 18500) @@ -1,43 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions - targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512/&q... - xmlns:tns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" - xmlns:wstrust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - xmlns:wsp="http://www.w3.org/ns/ws-policy" - xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"> + targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512/&q... + xmlns:tns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" + xmlns:wstrust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"> <wsdl:types> - <xs:schema elementFormDefault="qualified" targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'... + <xs:schema elementFormDefault="qualified" + targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'... - <xs:element name='RequestSecurityToken' type='wst:AbstractRequestSecurityTokenType' /> - <xs:element name='RequestSecurityTokenResponse' type='wst:AbstractRequestSecurityTokenType' /> + <xs:element name='RequestSecurityToken' + type='wst:AbstractRequestSecurityTokenType'/> + <xs:element name='RequestSecurityTokenResponse' + type='wst:AbstractRequestSecurityTokenType'/> - <xs:complexType name='AbstractRequestSecurityTokenType' > + <xs:complexType name='AbstractRequestSecurityTokenType'> <xs:sequence> - <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' /> + <xs:any namespace='##any' processContents='lax' minOccurs='0' + maxOccurs='unbounded'/> </xs:sequence> - <xs:attribute name='Context' type='xs:anyURI' use='optional' /> - <xs:anyAttribute namespace='##other' processContents='lax' /> + <xs:attribute name='Context' type='xs:anyURI' use='optional'/> + <xs:anyAttribute namespace='##other' processContents='lax'/> </xs:complexType> - <xs:element name='RequestSecurityTokenCollection' type='wst:RequestSecurityTokenCollectionType' /> - <xs:complexType name='RequestSecurityTokenCollectionType' > + <xs:element name='RequestSecurityTokenCollection' + type='wst:RequestSecurityTokenCollectionType'/> + <xs:complexType name='RequestSecurityTokenCollectionType'> <xs:sequence> - <xs:element name='RequestSecurityToken' type='wst:AbstractRequestSecurityTokenType' minOccurs='2' maxOccurs='unbounded'/> + <xs:element name='RequestSecurityToken' + type='wst:AbstractRequestSecurityTokenType' minOccurs='2' + maxOccurs='unbounded'/> </xs:sequence> </xs:complexType> - <xs:element name='RequestSecurityTokenResponseCollection' type='wst:RequestSecurityTokenResponseCollectionType' /> - <xs:complexType name='RequestSecurityTokenResponseCollectionType' > + <xs:element name='RequestSecurityTokenResponseCollection' + type='wst:RequestSecurityTokenResponseCollectionType'/> + <xs:complexType name='RequestSecurityTokenResponseCollectionType'> <xs:sequence> - <xs:element ref='wst:RequestSecurityTokenResponse' minOccurs='1' maxOccurs='unbounded' /> + <xs:element ref='wst:RequestSecurityTokenResponse' minOccurs='1' + maxOccurs='unbounded'/> </xs:sequence> - <xs:anyAttribute namespace='##other' processContents='lax' /> + <xs:anyAttribute namespace='##other' processContents='lax'/> </xs:complexType> </xs:schema> @@ -45,19 +54,19 @@ <!-- WS-Trust defines the following GEDs --> <wsdl:message name="RequestSecurityTokenMsg"> - <wsdl:part name="request" element="wst:RequestSecurityToken" /> + <wsdl:part name="request" element="wst:RequestSecurityToken"/> </wsdl:message> <wsdl:message name="RequestSecurityTokenResponseMsg"> <wsdl:part name="response" - element="wst:RequestSecurityTokenResponse" /> + element="wst:RequestSecurityTokenResponse"/> </wsdl:message> <wsdl:message name="RequestSecurityTokenCollectionMsg"> <wsdl:part name="requestCollection" - element="wst:RequestSecurityTokenCollection"/> + element="wst:RequestSecurityTokenCollection"/> </wsdl:message> <wsdl:message name="RequestSecurityTokenResponseCollectionMsg"> <wsdl:part name="responseCollection" - element="wst:RequestSecurityTokenResponseCollection"/> + element="wst:RequestSecurityTokenResponseCollection"/> </wsdl:message> <!-- This portType an example of a Requestor (or other) endpoint that @@ -72,24 +81,44 @@ <!-- This portType is an example of an STS supporting full protocol --> <wsdl:portType name="STS"> <wsdl:operation name="Cancel"> - <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Ca... message="tns:RequestSecurityTokenMsg"/> - <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/C... message="tns:RequestSecurityTokenResponseMsg"/> + <wsdl:input + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Ca... + message="tns:RequestSecurityTokenMsg"/> + <wsdl:output + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/C... + message="tns:RequestSecurityTokenResponseMsg"/> </wsdl:operation> <wsdl:operation name="Issue"> - <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Is... message="tns:RequestSecurityTokenMsg"/> - <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/... message="tns:RequestSecurityTokenResponseCollectionMsg"/> + <wsdl:input + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Is... + message="tns:RequestSecurityTokenMsg"/> + <wsdl:output + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/... + message="tns:RequestSecurityTokenResponseCollectionMsg"/> </wsdl:operation> <wsdl:operation name="Renew"> - <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Re... message="tns:RequestSecurityTokenMsg"/> - <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/R... message="tns:RequestSecurityTokenResponseMsg"/> + <wsdl:input + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Re... + message="tns:RequestSecurityTokenMsg"/> + <wsdl:output + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/R... + message="tns:RequestSecurityTokenResponseMsg"/> </wsdl:operation> <wsdl:operation name="Validate"> - <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Va... message="tns:RequestSecurityTokenMsg"/> - <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/V... message="tns:RequestSecurityTokenResponseMsg"/> + <wsdl:input + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Va... + message="tns:RequestSecurityTokenMsg"/> + <wsdl:output + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/V... + message="tns:RequestSecurityTokenResponseMsg"/> </wsdl:operation> <wsdl:operation name="KeyExchangeToken"> - <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KE... message="tns:RequestSecurityTokenMsg"/> - <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/K... message="tns:RequestSecurityTokenResponseMsg"/> + <wsdl:input + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KE... + message="tns:RequestSecurityTokenMsg"/> + <wsdl:output + wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/K... + message="tns:RequestSecurityTokenResponseMsg"/> </wsdl:operation> <wsdl:operation name="RequestCollection"> <wsdl:input message="tns:RequestSecurityTokenCollectionMsg"/> @@ -106,207 +135,199 @@ </wsdl:portType> <wsdl:binding name="UT_Binding" type="wstrust:STS"> - <wsp:PolicyReference URI="#UT_policy" /> - <soap:binding style="document" - transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="Issue"> - <soap:operation - soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Iss... /> - <wsdl:input> - <wsp:PolicyReference - URI="#Input_policy" /> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <wsp:PolicyReference - URI="#Output_policy" /> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="Validate"> - <soap:operation - soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Val... /> - <wsdl:input> - <wsp:PolicyReference - URI="#Input_policy" /> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <wsp:PolicyReference - URI="#Output_policy" /> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="Cancel"> - <soap:operation - soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Can... /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="Renew"> - <soap:operation - soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Ren... /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="KeyExchangeToken"> - <soap:operation - soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Key... /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="RequestCollection"> - <soap:operation - soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Req... /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> + <wsp:PolicyReference URI="#UT_policy"/> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="Issue"> + <soap:operation + soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Iss... + <wsdl:input> + <wsp:PolicyReference + URI="#Input_policy"/> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <wsp:PolicyReference + URI="#Output_policy"/> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Validate"> + <soap:operation + soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Val... + <wsdl:input> + <wsp:PolicyReference + URI="#Input_policy"/> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <wsp:PolicyReference + URI="#Output_policy"/> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Cancel"> + <soap:operation + soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Can... + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Renew"> + <soap:operation + soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Ren... + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="KeyExchangeToken"> + <soap:operation + soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Key... + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="RequestCollection"> + <soap:operation + soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Req... + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> </wsdl:binding> - + <wsdl:service name="SecurityTokenService"> - <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT" /> - </wsdl:port> + <wsdl:port name="UT_Port" binding="tns:UT_Binding"> + <soap:address location="http://localhost:8080/SecurityTokenService/UT"/> + </wsdl:port> </wsdl:service> - + <wsp:Policy wsu:Id="UT_policy"> - <wsp:ExactlyOne> - <wsp:All> - <wsap10:UsingAddressing/> - <sp:SymmetricBinding - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <wsp:Policy> - <sp:ProtectionToken> - <wsp:Policy> - <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... - <wsp:Policy> - <sp:RequireDerivedKeys /> - <sp:RequireThumbprintReference /> - <sp:WssX509V3Token10 /> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:ProtectionToken> - <sp:AlgorithmSuite> - <wsp:Policy> - <sp:Basic256 /> - </wsp:Policy> - </sp:AlgorithmSuite> - <sp:Layout> - <wsp:Policy> - <sp:Lax /> - </wsp:Policy> - </sp:Layout> - <sp:IncludeTimestamp /> - <sp:EncryptSignature /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:SymmetricBinding> - <sp:SignedSupportingTokens - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <wsp:Policy> - <sp:UsernameToken - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... - <wsp:Policy> - <sp:WssUsernameToken10 /> - </wsp:Policy> - </sp:UsernameToken> - </wsp:Policy> - </sp:SignedSupportingTokens> - <sp:Wss11 - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <wsp:Policy> - <sp:MustSupportRefKeyIdentifier /> - <sp:MustSupportRefIssuerSerial /> - <sp:MustSupportRefThumbprint /> - <sp:MustSupportRefEncryptedKey /> - </wsp:Policy> - </sp:Wss11> - <sp:Trust13 - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <wsp:Policy> - <sp:MustSupportIssuedTokens /> - <sp:RequireClientEntropy /> - <sp:RequireServerEntropy /> - </wsp:Policy> - </sp:Trust13> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - - <wsp:Policy wsu:Id="Input_policy"> - <wsp:ExactlyOne> - <wsp:All> - <sp:SignedParts - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <sp:Body /> - <sp:Header Name="To" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="From" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="FaultTo" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="ReplyTo" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="MessageID" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="RelatesTo" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="Action" - Namespace="http://www.w3.org/2005/08/addressing" /> - </sp:SignedParts> -<!-- <sp:EncryptedParts - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <sp:Body /> - </sp:EncryptedParts> --> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - - <wsp:Policy wsu:Id="Output_policy"> - <wsp:ExactlyOne> - <wsp:All> - <sp:SignedParts - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <sp:Body /> - <sp:Header Name="To" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="From" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="FaultTo" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="ReplyTo" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="MessageID" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="RelatesTo" - Namespace="http://www.w3.org/2005/08/addressing" /> - <sp:Header Name="Action" - Namespace="http://www.w3.org/2005/08/addressing" /> - </sp:SignedParts> -<!-- <sp:EncryptedParts - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <sp:Body /> - </sp:EncryptedParts>--> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> + <wsp:ExactlyOne> + <wsp:All> + <wsap10:UsingAddressing/> + <sp:SymmetricBinding + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... + <wsp:Policy> + <sp:RequireDerivedKeys/> + <sp:RequireThumbprintReference/> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic256/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:EncryptSignature/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:SignedSupportingTokens + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <wsp:Policy> + <sp:UsernameToken + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... + <wsp:Policy> + <sp:WssUsernameToken10/> + </wsp:Policy> + </sp:UsernameToken> + </wsp:Policy> + </sp:SignedSupportingTokens> + <sp:Wss11 + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + </wsp:Policy> + </sp:Wss11> + <sp:Trust13 + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <wsp:Policy> + <sp:MustSupportIssuedTokens/> + <sp:RequireClientEntropy/> + <sp:RequireServerEntropy/> + </wsp:Policy> + </sp:Trust13> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="Input_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <sp:Body/> + <sp:Header Name="To" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="From" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="FaultTo" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="ReplyTo" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="MessageID" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="RelatesTo" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="Action" + Namespace="http://www.w3.org/2005/08/addressing"/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + + <wsp:Policy wsu:Id="Output_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <sp:Body/> + <sp:Header Name="To" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="From" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="FaultTo" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="ReplyTo" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="MessageID" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="RelatesTo" + Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="Action" + Namespace="http://www.w3.org/2005/08/addressing"/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + </wsdl:definitions> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-12 15:23:05 UTC (rev 18499) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-12 19:30:43 UTC (rev 18500) @@ -704,9 +704,6 @@ <!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set --> <exclude>org/jboss/test/ws/jaxws/cxf/jbws3773/**</exclude> - - <!-- [JBWS-3738] test still under development --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude> </excludes> </configuration> </plugin>