Author: heiko.braun(a)jboss.com Date: 2007-06-12 10:20:53 -0400 (Tue, 12 Jun 2007) New Revision: 3556 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl Log: Resurrect ws-security interop endpoints Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 13:50:25 UTC (rev 3555) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 14:20:53 UTC (rev 3556) @@ -519,6 +519,60 @@ </fileset> </war> + <!-- jbossws-interop-wsse10Encrypt.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" + webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + + <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF"> + <include name="wsdl/**.*"/> + <include name="jboss-wsse-server.xml"/> + <include name="jboss-web.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> + <include name="alice.jks"/> + <include name="wsse10.truststore"/> + </webinf> + + <fileset dir="${tests.output.dir}/resources/interop/wsse/"> + <include name="*.*"/> + </fileset> + </war> + <!-- jbossws-interop-wsse10Encrypt-client.jar --> + <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar"> + <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/> + </jar> + + <!-- jbossws-interop-wsse10Sign.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" + webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + + <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF"> + <include name="wsdl/**.*"/> + <include name="jboss-wsse-server.xml"/> + <include name="jboss-web.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> + <include name="alice.jks"/> + <include name="wsse10.truststore"/> + </webinf> + + <fileset dir="${tests.output.dir}/resources/interop/wsse/"> + <include name="*.*"/> + </fileset> + </war> + <!-- jbossws-interop-wsse10Sign-client.jar --> + <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar"> + <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/> + </jar> + </target> </project> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-06-12 13:50:25 UTC (rev 3555) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-06-12 14:20:53 UTC (rev 3556) @@ -41,7 +41,7 @@ public class WSSecurityConfigFactory { // provide logging - final Logger log = Logger.getLogger(JAXRPCServerMetaDataBuilder.class); + final Logger log = Logger.getLogger(WSSecurityConfigFactory.class); public static WSSecurityConfigFactory newInstance() { @@ -74,8 +74,13 @@ initKeystorePath(vfsRoot, config); } - - return config; + else + { + // an exception might be better here... + log.warn("Unable to load ws-security config ("+resourceName+"). Security processing will be disabled"); + } + + return config; } public void initKeystorePath(UnifiedVirtualFile vfsRoot, WSSecurityConfiguration config) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-06-12 13:50:25 UTC (rev 3555) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-06-12 14:20:53 UTC (rev 3556) @@ -93,10 +93,10 @@ */ } - protected static void prepareClientClasspath(String s) { + protected static void addClientConfToClasspath(String s) { try { - // wrap the classload upfront to allow inclusion of the client.jar + // wrap the classloader upfront to allow inclusion of the client.jar JBossWSTestHelper helper = new JBossWSTestHelper(); ClassLoader parent = Thread.currentThread().getContextClassLoader(); URLClassLoader replacement = new URLClassLoader(new URL[] {helper.getArchiveURL(s)}, parent); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-12 13:50:25 UTC (rev 3555) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-12 14:20:53 UTC (rev 3556) @@ -34,12 +34,12 @@ public static Test suite() { - prepareClientClasspath("jbossws-interop-wsse10Encrypt-client.jar"); + addClientConfToClasspath("jbossws-interop-wsse10Encrypt-client.jar"); return JBossWSTestSetup.newTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war"); } - String getEndpointURL() { - return "http://jbossws.demo.jboss.com:8080/wsse10Encrypt/endpoint"; + String getEndpointURL() { + return "http://"+getServerHost()+":8080/wsse10Encrypt/endpoint"; } // Scenario 3.3. X509 Mutual Authentication, Sign Then Encrypt Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-12 13:50:25 UTC (rev 3555) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-12 14:20:53 UTC (rev 3556) @@ -33,12 +33,12 @@ public static Test suite() { - prepareClientClasspath("jbossws-interop-wsse10Sign-client.jar"); + addClientConfToClasspath("jbossws-interop-wsse10Sign-client.jar"); return JBossWSTestSetup.newTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war"); } String getEndpointURL() { - return "http://jbossws.demo.jboss.com:8080/wsse10Sign/endpoint"; + return "http://"+getServerHost()+":8080/wsse10Sign/endpoint"; } // Scenario 3.2. X509 Mutual Authentication, Sign Only Modified: trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl =================================================================== --- trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl 2007-06-12 13:50:25 UTC (rev 3555) +++ trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl 2007-06-12 14:20:53 UTC (rev 3556) @@ -1,33 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="PingService10Sign" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap10="http://www.w3.org/2005/08/addressing" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://InteropBaseAddress/interop" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/09/policy/addressing&... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing"><wsp:P... wsu:Id="MutualCertificate10Sign_IPingServiceSign_policy"><! wsp:ExactlyOne><wsp:All><sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...! rial/></wsp:Policy></sp:Wss10></wsp:All></wsp:ExactlyOne></wsp:Policy> <wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... wsu:Id="MutualCertificate10Sign_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... wsu:Id="MutualCertificate10Sign_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... wsu:Id="MutualCertificate10Sign_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...! ctlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_policy"><wsp:ExactlyOne><wsp:All><sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... wsu:Id="KS10_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><ws! p:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/ securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KS10_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="h! ttp://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KS10_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g...! ader Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/a ddressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KS10_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="htt! p://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KSD10_IPingServiceSign_policy"><wsp:ExactlyOne><wsp:All><sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...! :MustSupportRefIssuerSerial/></wsp:Policy></sp:Wss10><wsap:UsingAddres sing/></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KSD10_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:Signed! Parts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KSD10_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2! 004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.x mlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... wsu:Id="KSD10_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Rep! lyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/&g... - +<wsdl:definitions name="PingService10Sign" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap10="http://www.w3.org/2005/08/addressing" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://InteropBaseAddress/interop" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/09/policy/addressing&... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsdl:import namespace="http://InteropBaseAddress/interop" location="wsdl0.wsdl"/> <wsdl:types/> <wsdl:binding name="MutualCertificate10_IPingService" type="i0:IPingService"> - <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_policy"/> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/> <wsdl:operation name="Ping"> <soap:operation soapAction="http://xmlsoap.org/Ping" style="document"/> <wsdl:input name="PingRequest"> - <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_Ping_Input_policy"/> <soap:body use="literal"/> </wsdl:input> <wsdl:output name="PingResponse"> - <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_Ping_output_policy"/> <soap:body use="literal"/> </wsdl:output> </wsdl:operation> <wsdl:operation name="echo"> <soap:operation soapAction="http://InteropBaseAddress/interop/echo" style="document"/> - <wsdl:input><wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_echo_Input_policy"/> + <wsdl:input> <soap:body use="literal"/> </wsdl:input> <wsdl:output> - <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_echo_output_policy"/> <soap:body use="literal"/> </wsdl:output> </wsdl:operation>