Author: alessio.soldano(a)jboss.com Date: 2008-03-11 20:33:29 -0400 (Tue, 11 Mar 2008) New Revision: 5924 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java stack/native/trunk/src/test/resources/jaxws/jbws1988/ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml Removed: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/username-digest/ Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import-tests/build-samples-jaxws.xml Log: [JBWS-1988] Test case Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 00:09:56 UTC (rev 5923) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 00:33:29 UTC (rev 5924) @@ -664,6 +664,25 @@ </metainf> </jar> + <!-- jaxws-jbws1988 --> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1988.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1988/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1988/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF"> + <include name="jboss-wsse-server.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1988.sar"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF"> + <include name="jboss-service.xml"/> + <include name="login-config.xml"/> + <include name="jbossws-users.properties"/> + <include name="jbossws-roles.properties"/> + </metainf> + </jar> + <!-- jaxws-jbws1991 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1991.jar"> <fileset dir="${tests.output.dir}/classes"> Modified: stack/native/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-03-12 00:09:56 UTC (rev 5923) +++ stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-03-12 00:33:29 UTC (rev 5924) @@ -271,19 +271,6 @@ <include name="jboss-wsse-server.xml"/> </webinf> </war> - - <!-- jaxws-samples-wssecurity-username-digest --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-username-digest.war" - webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/username-digest/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/username-digest/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - </war> <!-- jaxws-samples-wssecurityAnnotatedpolicy-encrypt --> <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1988; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/jbws1988") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Hello +{ + @WebMethod + public String echo(String par); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1988; + +import javax.annotation.Resource; +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.WebServiceContext; + +import org.jboss.annotation.security.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.WebContext; + + +@Stateless +@WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1988") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*") +@EndpointConfig(configName = "Standard WSSecurity Endpoint") +@SecurityDomain("JBossWSDigest") +@RolesAllowed({"friend"}) +public class HelloJavaBean +{ + private Logger log = Logger.getLogger(HelloJavaBean.class); + @Resource + private WebServiceContext ctx; + + @WebMethod + public String echo(String par) + { + log.info("User principal: " + ctx.getUserPrincipal()); + return par; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1988; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * http://jira.jboss.org/jira/browse/JBWS-1988 + * Complete username token profile with digest and nonces + * + * @author alessio.soldano(a)jboss.com + * @since 11-Mar-2008 + */ +public class UsernameAuthTestCase extends JBossWSTest +{ + private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1988"; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.sar jaxws-jbws1988.jar"); + } + + public void testAuth() throws Exception + { + Hello port = getPort(); + ((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + ((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "therealfrog"); + String msg = "Hi!"; + try + { + String result = port.echo(msg); + assertEquals(msg, result); + } + catch (Exception e) + { + fail(); + } + } + + private Hello getPort() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1988", "HelloService"); + Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class); + URL securityURL = new File("resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml").toURL(); + ((StubExt)port).setSecurityConfig(securityURL.toExternalForm()); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); + ((BindingProvider)port).getRequestContext().put(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE); + return port; + } +} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java 2008-03-12 00:09:56 UTC (rev 5923) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java 2008-03-12 00:33:29 UTC (rev 5924) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wssecurity; - -import java.io.File; -import java.net.URL; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.ws.core.StubExt; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test WS-Security for Username Token with password digest - * - * @author alessio.soldano(a)jboss.com - * @since 10-Mar-2008 - */ -public class UsernamePwdDigestTestCase extends JBossWSTest -{ - private static UsernameEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(UsernamePwdDigestTestCase.class, "jaxws-samples-wssecurity-username-digest.war"); - } - - @Override - protected void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new File("resources/jaxws/samples/wssecurity/username-digest/META-INF/wsdl/UsernameService.wsdl").toURL(); - URL securityURL = new File("resources/jaxws/samples/wssecurity/username-digest/META-INF/jboss-wsse-client.xml").toURL(); - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService"); - - Service service = Service.create(wsdlURL, serviceName); - - port = (UsernameEndpoint)service.getPort(UsernameEndpoint.class); - ((StubExt)port).setSecurityConfig(securityURL.toExternalForm()); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - } - } - - public void testUsernameTokenNegative() throws Exception - { - try - { - port.getUsernameToken(); - fail("Server should respond with [401] - Unauthorized"); - } - catch (Exception ex) - { - // this should be ok - } - } - - public void testUsernameToken() throws Exception - { - Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); - reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit"); - reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - - String retObj = port.getUsernameToken(); - assertEquals("kermit", retObj); - } -} \ No newline at end of file Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" + name="jboss:service=DynamicLoginConfig"> + <attribute name="AuthConfig">META-INF/login-config.xml</attribute> + <!-- The service which supports dynamic processing of login-config.xml + configurations. + --> + <depends optional-attribute-name="LoginConfigService"> + jboss.security:service=XMLLoginConfig + </depends> + <!-- Optionally specify the security mgr service to use when + this service is stopped to flush the auth caches of the domains + registered by this service. + --> + <depends optional-attribute-name="SecurityManagerService"> + jboss.security:service=JaasSecurityManager + </depends> + </mbean> +</server> Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + + <config> + <username digestPassword="true"/> + <timestamp ttl="300"/> + </config> +</jboss-ws-security> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,10 @@ +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config + http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <timestamp ttl="300"/> + <requires/> + </config> + +</jboss-ws-security> Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,2 @@ +# A sample roles.properties file for use with the UsersRolesLoginModule +kermit=friend \ No newline at end of file Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,2 @@ +# A sample users.properties file for use with the UsersRolesLoginModule +kermit=therealfrog Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml 2008-03-12 00:33:29 UTC (rev 5924) @@ -0,0 +1,25 @@ +<?xml version='1.0'?> +<!DOCTYPE policy PUBLIC + "-//JBoss//DTD JBOSS Security Config 3.0//EN" + "http://www.jboss.org/j2ee/dtd/security_config.dtd"> + +<policy> + + <application-policy name="JBossWSDigest"> + <authentication> + <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" + flag="required"> + <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> + <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> + <module-option name="hashAlgorithm">SHA</module-option> + <module-option name="hashEncoding">BASE64</module-option> + <module-option name="hashUserPassword">false</module-option> + <module-option name="hashStorePassword">true</module-option> + <module-option name="storeDigestCallback">org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback</module-option> + <module-option name="unauthenticatedIdentity">anonymous</module-option> + </login-module> + </authentication> + </application-policy> + +</policy> + Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF