Author: asoldano Date: 2014-01-21 09:44:00 -0500 (Tue, 21 Jan 2014) New Revision: 18269 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java 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/cxf/jbws3648/PolicyAttachmentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java stack/cxf/trunk/modules/testsuite/test-utils/pom.xml Log: [JBWS-3662] Improving checks on availability of BouncyCastle and JCE unlimited strength crypto; also adding a check before running tests (and hence before any client side automatic registration of security provider). 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-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-21 14:44:00 UTC (rev 18269) @@ -389,6 +389,7 @@ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/wsf/test/ClientHelper.class"/> + <include name="org/jboss/wsf/test/CryptoHelper.class"/> <include name="org/jboss/wsf/test/TestServlet.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServiceIface.class"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -36,6 +36,7 @@ import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -91,7 +92,11 @@ EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class); setupWsse((BindingProvider)proxy); - assertEquals("Foo4", proxy.echo("Foo4")); + try { + assertEquals("Foo4", proxy.echo("Foo4")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } final String m = bos.toString(); assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous")); assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#aes256-cbc")); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -32,6 +32,7 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -69,12 +70,16 @@ public void test() throws Exception { - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "AnnotatedSecurityService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class); - setupWsse(proxy); - assertEquals("Secure Hello World!", proxy.sayHello()); + try { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "AnnotatedSecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class); + setupWsse(proxy); + assertEquals("Secure Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } private void setupWsse(AnnotatedServiceIface proxy) Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -34,6 +34,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.ws.api.configuration.ClientConfigUtil; import org.jboss.wsf.test.ClientHelper; +import org.jboss.wsf.test.CryptoHelper; public class SignEncryptHelper implements ClientHelper { @@ -91,7 +92,7 @@ } catch (SOAPFaultException e) { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + throw CryptoHelper.checkAndWrapException(e); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -31,6 +31,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -68,7 +69,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService221?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService221Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -86,7 +91,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService222?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService222Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -104,7 +113,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService223?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService223Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -122,7 +135,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService224?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService224Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } private void setupWsse(ServiceIface proxy) Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -32,6 +32,7 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -155,7 +156,11 @@ reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -177,7 +182,11 @@ reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); reqCtx.put(SecurityConstants.SELF_SIGN_SAML_ASSERTION, "true"); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -257,6 +266,10 @@ reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -30,6 +30,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSTest; /** @@ -66,7 +67,11 @@ final QName stsPortName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTSPort"); WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); - assertEquals("WS-Trust Hello World!", proxy.sayHello()); + try { + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } finally { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -30,6 +30,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSTest; /** @@ -72,8 +73,12 @@ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/";, "SecurityTokenService"); final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/";, "UT_Port"); WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); - - assertEquals("WS-Trust Hello World!", proxy.sayHello()); + + try { + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } finally { @@ -100,7 +105,11 @@ WSTrustTestUtils.setupWsse(proxy, bus); - assertEquals("WS-Trust Hello World!", proxy.sayHello()); + try { + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } finally { Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.wsf.test; + +import java.security.NoSuchAlgorithmException; + +import org.apache.cxf.binding.soap.SoapFault; + +public final class CryptoHelper +{ + public static Exception checkAndWrapException(Exception e) throws Exception { + if (!isBouncyCastleAvailable()) { + return new Exception("Bouncy Castle JCE provider does not seem to be properly installed; either install it " + + "or run the testuite with -Dexclude-integration-tests-BC-related=true to exclude this test.", e); + } else if(!isUnlimitedStrengthCryptographyAvailable()) { + return new Exception("JCE unlimited strength cryptography extension does not seem to be properly installed; either install it " + + "or run the testuite with '-Dexclude-integration-tests-unlimited-strength-related=true' to exclude this test.", e); + } else if (e.getCause() != null && e.getCause() instanceof SoapFault && e.getMessage() != null && e.getMessage().contains("algorithm")) { + return new Exception("Please check for Bouncy Castle JCE provider and JCE unlimited strenght cryptography extension availability on server side.", e); + } else { + return e; + } + } + + public static boolean isBouncyCastleAvailable() { + return java.security.Security.getProvider("BC") != null; + } + + public static boolean isUnlimitedStrengthCryptographyAvailable() { + try { + return (javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") >= 256); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/test-utils/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2014-01-21 11:04:21 UTC (rev 18268) +++ stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2014-01-21 14:44:00 UTC (rev 18269) @@ -32,4 +32,26 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>check-bc-and-unlimited-crypto</id> + <phase>pre-integration-test</phase> + <goals> + <goal>java</goal> + </goals> + <configuration> + <mainClass>org.jboss.wsf.test.CryptoCheckMain</mainClass> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Added: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java 2014-01-21 14:44:00 UTC (rev 18269) @@ -0,0 +1,19 @@ +package org.jboss.wsf.test; + +/** + * + * @author Rostislav Svoboda + */ +public class CryptoCheckMain +{ + + public static void main(String[] args) throws Exception + { + System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + System.out.println("JCE unlimited strength cryptography: " + ((javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") < 256)?"NOT ":"") + "INSTALLED" ); + System.out.println("Bouncy Castle JCE Provider: " + ((java.security.Security.getProvider("BC") == null)?"NOT ":"") + "INSTALLED" ); + System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + } + +} + Property changes on: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native