Author: jim.ma Date: 2014-01-13 05:05:29 -0500 (Mon, 13 Jan 2014) New Revision: 18230 Added: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/META-INF/ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/META-INF/jaxws-client-config.xml Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java stack/cxf/branches/jaspi/modules/dist/pom.xml stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jaspi/modules/jaspi/pom.xml stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java Log: Add test for client side jaspi AuthModule Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java =================================================================== --- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-01-13 10:05:29 UTC (rev 18230) @@ -604,11 +604,6 @@ Client client = obj instanceof DispatchImpl<?> ? ((DispatchImpl<?>)obj).getClient() : ClientProxy.getClient(obj); client.getOutInterceptors().add(new HandlerChainSortInterceptor(binding)); - JaspiClientAuthenticator clientAuthenticator = getJaspiAuthenticator(client) ; - if (clientAuthenticator != null) { - client.getInInterceptors().add(new JaspiClientInInterceptor(clientAuthenticator)); - client.getOutInterceptors().add(new JaspiClientOutInterceptor(clientAuthenticator)); - } if (jbossModulesEnv) { //optimization for avoiding checking for a server config when we know for sure we're out-of-container ServerConfig sc = getServerConfig(); @@ -629,46 +624,7 @@ } } } - } - - private JaspiClientAuthenticator getJaspiAuthenticator(Client client) { - //TODO:Decide where to get the client jaspi security domain - String securityDomain = "jaspi-client"; - ApplicationPolicy appPolicy = SecurityConfiguration.getApplicationPolicy(securityDomain); - if (appPolicy == null) { - Loggers.ROOT_LOGGER.noApplicationPolicy(securityDomain); - return null; - } - BaseAuthenticationInfo bai = appPolicy.getAuthenticationInfo(); - if (bai == null || bai instanceof AuthenticationInfo) { - Loggers.ROOT_LOGGER.noJaspiApplicationPolicy(securityDomain); - return null; - } - JASPIAuthenticationInfo jai = (JASPIAuthenticationInfo) bai; - - String contextRoot = client.getEndpoint().getEndpointInfo().getName().toString(); - String appId = "localhost " + contextRoot; - AuthConfigFactory factory = AuthConfigFactory.getFactory(); - - Properties properties = new Properties(); - AuthConfigProvider provider = new JBossWSAuthConfigProvider(properties, factory); - provider = factory.getConfigProvider(JBossWSAuthConstants.SOAP_LAYER, appId, null); - JBossCallbackHandler callbackHandler = new JBossCallbackHandler(); - try - { - ClientAuthConfig clientConfig = provider.getClientAuthConfig("soap", appId, callbackHandler); - return new JaspiClientAuthenticator(clientConfig, securityDomain, jai); - } - catch (Exception e) - { - //ignore - } - - return null; - - } - - + } } //lazy get the server config (and try once per classloader only) Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java =================================================================== --- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2014-01-13 10:05:29 UTC (rev 18230) @@ -22,14 +22,31 @@ package org.jboss.wsf.stack.cxf.client.configuration; import java.util.Map; +import java.util.Properties; import java.util.Set; +import javax.security.auth.message.config.AuthConfigFactory; +import javax.security.auth.message.config.AuthConfigProvider; +import javax.security.auth.message.config.ClientAuthConfig; + import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.jaxws.DispatchImpl; +import org.jboss.security.auth.callback.JBossCallbackHandler; +import org.jboss.security.auth.login.AuthenticationInfo; +import org.jboss.security.auth.login.BaseAuthenticationInfo; +import org.jboss.security.auth.login.JASPIAuthenticationInfo; +import org.jboss.security.config.ApplicationPolicy; +import org.jboss.security.config.SecurityConfiguration; import org.jboss.ws.common.configuration.ConfigHelper; import org.jboss.wsf.spi.metadata.config.ClientConfig; +import org.jboss.wsf.stack.cxf.Loggers; +import org.jboss.wsf.stack.cxf.client.jaspi.JaspiClientAuthenticator; +import org.jboss.wsf.stack.cxf.client.jaspi.JaspiClientInInterceptor; +import org.jboss.wsf.stack.cxf.client.jaspi.JaspiClientOutInterceptor; +import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConfigProvider; +import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConstants; /** * CXF extension of common ClientConfigurer @@ -57,8 +74,56 @@ savePropList(cxfClient, props); } setConfigProperties(cxfClient, props); + + //config jaspi + JaspiClientAuthenticator clientAuthenticator = getJaspiAuthenticator(cxfClient, props) ; + if (clientAuthenticator != null) { + cxfClient.getInInterceptors().add(new JaspiClientInInterceptor(clientAuthenticator)); + cxfClient.getOutInterceptors().add(new JaspiClientOutInterceptor(clientAuthenticator)); + } + } + + private JaspiClientAuthenticator getJaspiAuthenticator(Client client, Map<String, String> properties) { + String securityDomain = properties.get(JaspiClientAuthenticator.JASPI_SECURITY_DOMAIN); + if (securityDomain == null) { + return null; + } + ApplicationPolicy appPolicy = SecurityConfiguration.getApplicationPolicy(securityDomain); + if (appPolicy == null) { + Loggers.ROOT_LOGGER.noApplicationPolicy(securityDomain); + return null; + } + BaseAuthenticationInfo bai = appPolicy.getAuthenticationInfo(); + if (bai == null || bai instanceof AuthenticationInfo) { + Loggers.ROOT_LOGGER.noJaspiApplicationPolicy(securityDomain); + return null; + } + JASPIAuthenticationInfo jai = (JASPIAuthenticationInfo) bai; + + String contextRoot = client.getEndpoint().getEndpointInfo().getName().toString(); + String appId = "localhost " + contextRoot; + AuthConfigFactory factory = AuthConfigFactory.getFactory(); + + Properties props = new Properties(); + AuthConfigProvider provider = new JBossWSAuthConfigProvider(props, factory); + provider = factory.getConfigProvider(JBossWSAuthConstants.SOAP_LAYER, appId, null); + JBossCallbackHandler callbackHandler = new JBossCallbackHandler(); + try + { + ClientAuthConfig clientConfig = provider.getClientAuthConfig("soap", appId, callbackHandler); + return new JaspiClientAuthenticator(clientConfig, securityDomain, jai); + } + catch (Exception e) + { + //ignore + } + + return null; + + } + public void setConfigProperties(Client client, Map<String, String> properties) { client.getEndpoint().putAll(properties); } Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java =================================================================== --- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java 2014-01-13 10:05:29 UTC (rev 18230) @@ -23,6 +23,7 @@ */ public class JaspiClientAuthenticator { + public static final String JASPI_SECURITY_DOMAIN = "jaspi.security.domain"; private ClientAuthConfig clientConfig; private String securityDomain; private JASPIAuthenticationInfo jpi; Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java =================================================================== --- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java 2014-01-13 10:05:29 UTC (rev 18230) @@ -49,7 +49,7 @@ */ public class SOAPClientAuthModule implements ClientAuthModule { - + public static String log; @SuppressWarnings("rawtypes") private List<Class> supportedTypes = new ArrayList<Class>(); private SimplePrincipal principal = null; @@ -88,7 +88,7 @@ @SuppressWarnings({ "unchecked" }) public AuthStatus secureRequest(MessageInfo messageInfo, Subject source) throws AuthException { - + log = "secureRequest"; SOAPMessage soapMessage = (SOAPMessage)messageInfo.getRequestMessage(); return AuthStatus.SUCCESS; } Modified: stack/cxf/branches/jaspi/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jaspi/modules/dist/pom.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/dist/pom.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -24,6 +24,12 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-jaspi</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-transports-httpserver</artifactId> <version>${project.version}</version> </dependency> Modified: stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -30,6 +30,7 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws.cxf:jbossws-cxf-client:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-jaspi:jar</include> <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> <include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include> <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> Modified: stack/cxf/branches/jaspi/modules/jaspi/pom.xml =================================================================== --- stack/cxf/branches/jaspi/modules/jaspi/pom.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/jaspi/pom.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -15,14 +15,7 @@ <!-- Dependencies --> <dependencies> - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-jaspi</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> </dependency> Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml =================================================================== --- stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -47,5 +47,8 @@ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" /> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" /> <module name="org.jboss.jaxbintros" export="true"/> + <module name="javax.security.auth.message.api" export="true"/> + <module name="org.picketbox" export="true"/> + <module name="org.apache.ws.security" export="true"/> </dependencies> </module> Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -36,6 +36,7 @@ <module name="javax.api" /> <module name="javax.servlet.api" /> <module name="javax.xml.bind.api" /> + <module name="javax.security.auth.message.api"/> <module name="com.sun.xml.bind" services="import"/> <module name="javax.xml.ws.api" /> <module name="org.jboss.ws.api" /> @@ -65,6 +66,7 @@ <module name="org.apache.neethi" /> <module name="org.apache.ws.security" /> <module name="org.jboss.logging" /> + <module name="org.picketbox"/> <module name="org.springframework.spring" optional="true"> <imports> <include path="META-INF"/> Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -38,6 +38,7 @@ <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-cxf-client.jar"/> + <include name="**/jbossws-cxf-jaspi.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main" flatten="false" overwrite="true"> Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -562,7 +562,25 @@ </manifest> </war> - + <!-- jaxws-samples-wsse-policy-username-jaspi-client --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaspi-client.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceIface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/UsernamePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> + <include name="org/jboss/wsf/test/TestServlet.class"/> + <include name="org/jboss/wsf/test/ClientHelper.class"/> + </classes> + <classes dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi"> + <include name="META-INF/jaxws-client-config.xml"/> + </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> + </manifest> + </war> + <!-- jaxws-samples-wsse-policy-username-jaas-digest --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest.war" Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java =================================================================== --- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java 2014-01-10 14:24:51 UTC (rev 18229) +++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java 2014-01-13 10:05:29 UTC (rev 18230) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -46,7 +48,7 @@ public static Test suite() { - TestSetup testSetup = new JBossWSCXFTestSetup(JaspiAuthenticationTestCase.class, "jaxws-samples-wsse-policy-username-jaspi.war") { + TestSetup testSetup = new JBossWSCXFTestSetup(JaspiAuthenticationTestCase.class, "jaxws-samples-wsse-policy-username-jaspi.war, jaxws-samples-wsse-policy-username-jaspi-client.war") { public void setUp() throws Exception { @@ -65,12 +67,15 @@ Map<String, String> authModuleOptions = new HashMap<String, String>(); JBossWSTestHelper.addJaspiSecurityDomain("jaspi", "jaas-lm-stack", loginModuleOptions, "org.jboss.wsf.stack.cxf.jaspi.module.UsernameTokenServerAuthModule", authModuleOptions); + JBossWSTestHelper.addJaspiSecurityDomain("clientJaspi", "jaas-lm-stack", loginModuleOptions, "org.jboss.wsf.stack.cxf.client.jaspi.module.SOAPClientAuthModule", + authModuleOptions); super.setUp(); } public void tearDown() throws Exception { JBossWSTestHelper.removeSecurityDomain("jaspi"); + JBossWSTestHelper.removeSecurityDomain("clientJaspi"); super.tearDown(); } @@ -122,6 +127,25 @@ setupWsse(proxy, "kermit"); assertEquals("Secure Hello World!", proxy.sayHello()); } + + + public void testInContainerClientAuthModule() throws Exception + { + Helper helper = new Helper(); + helper.setTargetEndpoint("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-jaspi"); + assertEquals("1", runTestInContainer("testJaspiClient")); + } + + + private String runTestInContainer(String test) throws Exception + { + URL url = new URL("http://" + getServerHost() + + ":8080/jaxws-samples-wsse-policy-username-jaspi-client?path=/jaxws-samples-wsse-policy-username-jaspi&method=" + test + + "&helper=" + Helper.class.getName()); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + return br.readLine(); + } + private void setupWsse(ServiceIface proxy, String username) { Added: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/META-INF/jaxws-client-config.xml =================================================================== --- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/META-INF/jaxws-client-config.xml (rev 0) +++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/META-INF/jaxws-client-config.xml 2014-01-13 10:05:29 UTC (rev 18230) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + <client-config> + <config-name>jaspiSecurityDomain</config-name> + <property> + <property-name>jaspi.security.domain</property-name> + <property-value>clientJaspi</property-value> + </property> + </client-config> +</jaxws-config> \ No newline at end of file Property changes on: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/META-INF/jaxws-client-config.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native