Fixing failing tests with limited security policies Conflicts: systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/feb17f15 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/feb17f15 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/feb17f15 Branch: refs/heads/3.0.x-fixes Commit: feb17f1590a0fe5bec2726f9bf9e101d4e61bf9d Parents: 9bc19b6 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Oct 19 11:09:04 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Oct 19 11:11:58 2015 +0100 ---------------------------------------------------------------------- .../jaxrs/security/SecurityTestUtil.java | 59 ++++++++++++++++++++ .../jaxrs/security/jwt/JAXRSJwsJsonTest.java | 8 +++ .../jaxrs/security/jwt/JweJwsAlgorithmTest.java | 4 ++ 3 files changed, 71 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/feb17f15/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityTestUtil.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityTestUtil.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityTestUtil.java new file mode 100644 index 0000000..c39782d --- /dev/null +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityTestUtil.java @@ -0,0 +1,59 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.jaxrs.security; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + +/** + * A utility class for security tests + */ +public final class SecurityTestUtil { + + private static final boolean UNRESTRICTED_POLICIES_INSTALLED; + static { + boolean ok = false; + try { + byte[] data = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}; + + SecretKey key192 = new SecretKeySpec( + new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17}, + "AES"); + Cipher c = Cipher.getInstance("AES"); + c.init(Cipher.ENCRYPT_MODE, key192); + c.doFinal(data); + ok = true; + } catch (Exception e) { + // + } + UNRESTRICTED_POLICIES_INSTALLED = ok; + } + + private SecurityTestUtil() { + // complete + } + + public static boolean checkUnrestrictedPoliciesInstalled() { + return UNRESTRICTED_POLICIES_INSTALLED; + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/feb17f15/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java index a72c6f9..473709d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java @@ -43,6 +43,7 @@ import org.apache.cxf.rs.security.jose.jaxrs.JwsJsonClientResponseFilter; import org.apache.cxf.rs.security.jose.jaxrs.JwsJsonWriterInterceptor; import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils; import org.apache.cxf.systest.jaxrs.security.Book; +import org.apache.cxf.systest.jaxrs.security.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -100,9 +101,16 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase { } @Test public void testJweCompactJwsJsonBookBeanHmac() throws Exception { +<<<<<<< HEAD if (SKIP_AES_GCM_TESTS) { return; } +======= + if (!SecurityTestUtil.checkUnrestrictedPoliciesInstalled()) { + return; + } + +>>>>>>> 4ba52d1... Fixing failing tests with limited security policies String address = "https://localhost:" + PORT + "/jwejwsjsonhmac"; List<?> extraProviders = Arrays.asList(new JacksonJsonProvider(), new JweWriterInterceptor(), http://git-wip-us.apache.org/repos/asf/cxf/blob/feb17f15/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JweJwsAlgorithmTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JweJwsAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JweJwsAlgorithmTest.java index 4afcefa..e70545c 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JweJwsAlgorithmTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JweJwsAlgorithmTest.java @@ -34,6 +34,7 @@ import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jaxrs.JweWriterInterceptor; import org.apache.cxf.rs.security.jose.jaxrs.JwsWriterInterceptor; import org.apache.cxf.systest.jaxrs.security.Book; +import org.apache.cxf.systest.jaxrs.security.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.AfterClass; @@ -150,6 +151,9 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { @org.junit.Test public void testWrongContentEncryptionAlgorithm() throws Exception { + if (!SecurityTestUtil.checkUnrestrictedPoliciesInstalled()) { + return; + } URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml");