Author: rsearls Date: 2014-03-14 13:31:18 -0400 (Fri, 14 Mar 2014) New Revision: 18525 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService_schema1.xsd 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/WSTrustTestUtils.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3738] Base components for Holder of Key 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-14 10:59:47 UTC (rev 18524) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-14 17:31:18 UTC (rev 18525) @@ -572,7 +572,8 @@ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> - <include name="wsdl/Bearer*"/> + <include name="wsdl/BearerService.wsdl"/> + <include name="wsdl/BearerService_schema1.xsd"/> </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> <include name="servicestore.jks" /> @@ -583,6 +584,49 @@ </manifest> </war> + <!-- jaxws-samples-wsse-policy-trust-sts-holderofkey --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-sts-holderofkey.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> + <include name="wsdl/bearer-ws-trust*"/> + <include name="jboss-web.xml"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> + <include name="stsstore.jks" /> + <include name="stsKeystore.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl --> + </manifest> + </war> + + + <!-- jaxws-samples-wsse-policy-trust-holderofkey --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-holderofkey.war" needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyIface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> + <include name="wsdl/HolderOfKeyService.wsdl"/> + <include name="wsdl/HolderOfKeyService_schema1.xsd"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> + <include name="servicestore.jks" /> + <include name="serviceKeystore.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> + </manifest> + </war> + <!-- jaxws-samples-wsse-policy-trustPicketLink-sts --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trustPicketLink-sts.war" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java 2014-03-14 17:31:18 UTC (rev 18525) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trust; + +import junit.framework.Test; +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface; +import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey.HolderOfKeyIface; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +/** + * A demo of using SAML Holder-of-key + * + * User: rsearls(a)redhat.com + * Date: 3/14/14 + */ +public class WSTrustHolderOfTrustTestCase extends JBossWSTest +{ + private final String serviceURL = "https://" + getServerHost() + + ":8443/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService"; + + public static Test suite() + { + //deploy client, STS and service; start a security domain to be used by the STS for authenticating client + JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustHolderOfTrustTestCase.class, + "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-holderofkey.war jaxws-samples-wsse-policy-trust-holderofkey.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 testBearer() throws Exception + { + + Bus bus = BusFactory.newInstance().createBus(); + try + { + + BusFactory.setThreadDefaultBus(bus); + + final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/holderofkeywssecur...;, "HolderOfKeyService"); + final URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + HolderOfKeyIface proxy = (HolderOfKeyIface) service.getPort(HolderOfKeyIface.class); + + WSTrustTestUtils.setupWsseAndSTSClientHolderOfKey((BindingProvider) proxy, bus); + assertEquals("Holder-Of-Key WS-Trust Hello World!", proxy.sayHello()); + + } finally + { + bus.shutdown(true); + } + } + +} 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-14 10:59:47 UTC (rev 18524) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-14 17:31:18 UTC (rev 18525) @@ -219,6 +219,28 @@ ctx.put(SecurityConstants.STS_CLIENT, stsClient); } + public static void setupWsseAndSTSClientHolderOfKey(BindingProvider proxy, Bus bus) { + + Map<String, Object> ctx = proxy.getRequestContext(); + + 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); + } + private static String appendIssuedTokenSuffix(String prop) { return prop + ".it"; Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyIface.java 2014-03-14 17:31:18 UTC (rev 18525) @@ -0,0 +1,13 @@ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/holderofkeywssecuritypolicy" +) +public interface HolderOfKeyIface { + @WebMethod + String sayHello(); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKeyImpl.java 2014-03-14 17:31:18 UTC (rev 18525) @@ -0,0 +1,26 @@ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface; + +import javax.jws.WebService; + +@WebService + ( + portName = "HolderOfKeyServicePort", + serviceName = "HolderOfKeyService", + wsdlLocation = "WEB-INF/wsdl/HolderOfKeyService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/holderofkeywssecuritypolicy", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey.HolderOfKeyIface" + ) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties") +}) +public class HolderOfKeyImpl implements HolderOfKeyIface +{ + public String sayHello() + { + return "Holder-Of-Key WS-Trust Hello World!"; + } +} \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java 2014-03-14 17:31:18 UTC (rev 18525) @@ -0,0 +1,73 @@ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsholderofkey; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +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.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.sts.provider.SecurityTokenServiceProvider; +import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.STSBearerCallbackHandler; + +import javax.xml.ws.WebServiceProvider; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +/** + * User: rsearls + * Date: 3/14/14 + */ +@WebServiceProvider(serviceName = "SecurityTokenService", + portName = "UT_Port", + targetNamespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", + wsdlLocation = "WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl") //holderofkey +//be sure to have dependency on org.apache.cxf module when on AS7, otherwise Apache CXF annotations are ignored +@EndpointProperties(value = { +// @EndpointProperty(key = "ws-security.signature.username", value = "mystskey"), + @EndpointProperty(key = "ws-security.signature.properties", value = "stsKeystore.properties"), + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.STSBearerCallbackHandler") +}) +public class SampleSTSHolderOfKey extends SecurityTokenServiceProvider +{ + + public SampleSTSHolderOfKey() throws Exception + { + super(); + + StaticSTSProperties props = new StaticSTSProperties(); + props.setSignatureCryptoProperties("stsKeystore.properties"); + props.setSignatureUsername("mystskey"); + props.setCallbackHandlerClass(STSBearerCallbackHandler.class.getName()); + props.setEncryptionCryptoProperties("stsKeystore.properties"); + props.setEncryptionUsername("myservicekey"); + props.setIssuer("DoubleItSTSIssuer"); + + List<ServiceMBean> services = new LinkedList<ServiceMBean>(); + StaticService service = new StaticService(); + service.setEndpoints(Arrays.asList( + "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService", + "https://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService", + "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService" + )); + + services.add(service); + + TokenIssueOperation issueOperation = new TokenIssueOperation(); + issueOperation.getTokenProviders().add(new SAMLTokenProvider()); + issueOperation.getDelegationHandlers().add(new HOKDelegationHandler()); + issueOperation.setServices(services); + issueOperation.setStsProperties(props); + this.setIssueOperation(issueOperation); + + TokenValidateOperation validationOperation = new TokenValidateOperation(); + validationOperation.getTokenValidators().add(new SAMLTokenValidator()); + validationOperation.setStsProperties(props); + this.setValidateOperation(validationOperation); + + } +} \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService_schema1.xsd =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService_schema1.xsd ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-14 10:59:47 UTC (rev 18524) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-14 17:31:18 UTC (rev 18525) @@ -704,6 +704,9 @@ <!-- [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] still under development --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfTrustTestCase*</exclude> </excludes> </configuration> </plugin>