Author: alessio.soldano(a)jboss.com Date: 2010-05-13 04:23:30 -0400 (Thu, 13 May 2010) New Revision: 12222 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Client.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/ framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/ framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml Log: [JBWS-3025] Adding testcase with multiple webservicerefs using the same service/port with different security credentials Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-05-13 08:22:15 UTC (rev 12221) +++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-05-13 08:23:30 UTC (rev 12222) @@ -428,6 +428,25 @@ <include name="wsdl/**"/> </metainf> </jar> + + <!-- jaxws-samples-webservicerefsec --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webservicerefsec.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointImpl.class" /> + </fileset> + </jar> + <war destfile="${tests.output.dir}/test-libs/jaxws-samples-webservicerefsec-servlet-client.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/webservicerefsec/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/Client.class" /> + <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/Endpoint.class" /> + <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webservicerefsec/WEB-INF"> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + </webinf> + </war> <!-- jaxws-samples-xop-doclit --> <war jarfile="${tests.output.dir}/test-libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Client.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Client.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Client.java 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservicerefsec; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; + +public class Client extends HttpServlet +{ + private static final long serialVersionUID = -5930858947901509123L; + + // Provide logging + private static Logger log = Logger.getLogger(Client.class); + + @WebServiceRef + static EndpointService authorizedService; + + @WebServiceRef + static EndpointService unauthorizedService; + + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String inStr = req.getParameter("echo"); + log.info("doGet: " + inStr); + + String outStr = null; + Endpoint ep = authorizedService.getPort(Endpoint.class); + log.info("Performing invocation with username: " + ((BindingProvider) ep).getRequestContext().get(BindingProvider.USERNAME_PROPERTY)); + outStr = ep.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + + boolean invokationSucceeded = false; + try + { + Endpoint uep = unauthorizedService.getPort(Endpoint.class); + log.info("Performing invocation with username: " + ((BindingProvider) uep).getRequestContext().get(BindingProvider.USERNAME_PROPERTY)); + uep.echo(inStr); + invokationSucceeded = true; + } + catch (Exception e) + { + log.info(e); + } + if (invokationSucceeded) + { + throw new RuntimeException("Expected exception!"); + } + + res.getWriter().print(outStr); + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Endpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/Endpoint.java 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservicerefsec; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webservicerefsec?wsdl") +@SOAPBinding(style = Style.RPC) +public interface Endpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointImpl.java 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservicerefsec; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.ejb3.annotation.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.AuthMethod; +import org.jboss.wsf.spi.annotation.TransportGuarantee; +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; + +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@SOAPBinding(style = Style.RPC) +@Stateless(name = "webservicerefSecTest") +@WebContext +( + contextRoot = "/jaxws-samples-webservicerefsec", + urlPattern = "/*", + authMethod = AuthMethod.BASIC, + transportGuarantee = TransportGuarantee.NONE, + secureWSDLAccess = false +) +@SecurityDomain("JBossWS") +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + @RolesAllowed("friend") + public String echo(String input) + { + log.info(input); + return input; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservicerefsec; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebServiceClient(name = "EndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "META-INF/wsdl/Endpoint.wsdl") +public class EndpointService extends Service +{ + + private final static URL ENDPOINTSERVICE_WSDL_LOCATION; + private final static WebServiceException ENDPOINTSERVICE_EXCEPTION; + private final static QName ENDPOINTSERVICE_QNAME = new QName("http://org.jboss.ws/wsref", "EndpointService"); + + static + { + URL url = null; + WebServiceException e = null; + url = EndpointService.class.getResource("bogusAddress"); //invalid address on purpose + if (url == null) + { + e = new WebServiceException("Cannot find wsdl, please put in classpath"); + } + ENDPOINTSERVICE_WSDL_LOCATION = url; + ENDPOINTSERVICE_EXCEPTION = e; + } + + public EndpointService() + { + super(__getWsdlLocation(), ENDPOINTSERVICE_QNAME); + } + + public EndpointService(URL wsdlLocation) + { + super(wsdlLocation, ENDPOINTSERVICE_QNAME); + } + + public EndpointService(URL wsdlLocation, QName serviceName) + { + super(wsdlLocation, serviceName); + } + + /** + * + * @return + * returns Endpoint + */ + @WebEndpoint(name = "EndpointPort") + public Endpoint getEndpointPort() + { + return super.getPort(new QName("http://org.jboss.ws/wsref", "EndpointPort"), Endpoint.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns Endpoint + */ + @WebEndpoint(name = "EndpointPort") + public Endpoint getEndpointPort(WebServiceFeature... features) + { + return super.getPort(new QName("http://org.jboss.ws/wsref", "EndpointPort"), Endpoint.class, features); + } + + private static URL __getWsdlLocation() + { + if (ENDPOINTSERVICE_EXCEPTION != null) + { + throw ENDPOINTSERVICE_EXCEPTION; + } + return ENDPOINTSERVICE_WSDL_LOCATION; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservicerefsec; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test multiple webserviceref fro the same endpoint with different security credentials + * + * @author alessio.soldano(a)jboss.com + * @since 12-May-2010 + */ +public class WebServiceRefSecTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webservicerefsec"; + + public static Test suite() + { + return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar"); + } + + public void testServletClient() throws Exception + { + deploy("jaxws-samples-webservicerefsec-servlet-client.war"); + try + { + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); + } + finally + { + undeploy("jaxws-samples-webservicerefsec-servlet-client.war"); + } + } +} Added: framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/jboss-web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/jboss-web.xml 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> + +<jboss-web> + + <service-ref> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webservicerefsec.Client/authorizedService</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webservicerefsec.Endpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}EndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webservicerefsec.Client/unauthorizedService</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webservicerefsec.Endpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}EndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>foo</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>bar</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> + </service-ref> + +</jboss-web> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/web.xml 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"> + + <servlet> + <servlet-name>Client</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.webservicerefsec.Client</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Client</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2010-05-13 08:23:30 UTC (rev 12222) @@ -0,0 +1,36 @@ +<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <message name='Endpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='Endpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + + <portType name='Endpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:Endpoint_echo'/> + <output message='tns:Endpoint_echoResponse'/> + </operation> + </portType> + + <binding name='EndpointBinding' type='tns:Endpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </output> + </operation> + </binding> + + <service name='EndpointService'> + <port binding='tns:EndpointBinding' name='EndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webservicerefsec'/> + </port> + </service> + +</definitions>