From baee9c938ce5caaa20879c494cce9beb01f3a8e0 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 19 Mar 2021 12:00:30 -0400 Subject: [PATCH] Delete keystores from distribution The Keystore is no longer needed in the tarball, as it is supplied externally by the CSITs and Helm charts. Deleted that file. Also modified the junits to use utils-test to generates keystores at runtime, thus deleted the junit keystore file, too. Issue-ID: POLICY-3143 Change-Id: I9daf6da10f2027880c260bd6f529bf6c6e7c2e91 Signed-off-by: Jim Hahn --- .../main/rest/TestHttpsDistributionRestServer.java | 10 +++++----- .../rest/TestHttpsStatisticDistributionRestServer.java | 11 +++++------ main/src/test/resources/ssl/policy-keystore | Bin 4431 -> 0 bytes .../src/main/resources/etc/ssl/policy-keystore | Bin 4431 -> 0 bytes 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 main/src/test/resources/ssl/policy-keystore delete mode 100644 packages/policy-distribution-tarball/src/main/resources/etc/ssl/policy-keystore diff --git a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java index 4e2fa574..ef4d1f5b 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java +++ b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsDistributionRestServer.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Intel. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. - * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,6 +39,7 @@ import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.junit.Test; import org.onap.policy.common.endpoints.report.HealthCheckReport; import org.onap.policy.common.utils.network.NetworkUtil; +import org.onap.policy.common.utils.security.SelfSignedKeyStore; import org.onap.policy.distribution.main.PolicyDistributionException; import org.onap.policy.distribution.main.parameters.CommonTestData; import org.onap.policy.distribution.main.startstop.Main; @@ -53,7 +54,6 @@ public class TestHttpsDistributionRestServer { private static final String ALIVE = "alive"; private static final String SELF = NetworkUtil.getHostname(); private static final String NAME = "Policy SSD"; - private static String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore"; private int port; @@ -68,10 +68,10 @@ public class TestHttpsDistributionRestServer { }).doesNotThrowAnyException(); } - private Main startDistributionService() throws IOException { + private Main startDistributionService() throws IOException, InterruptedException { final Properties systemProps = System.getProperties(); - systemProps.put("javax.net.ssl.keyStore", KEYSTORE); - systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap"); + systemProps.put("javax.net.ssl.keyStore", new SelfSignedKeyStore().getKeystoreName()); + systemProps.put("javax.net.ssl.keyStorePassword", SelfSignedKeyStore.KEYSTORE_PASSWORD); System.setProperties(systemProps); port = CommonTestData.makeConfigFile("parameters/DistributionConfigParameters_Https.json"); diff --git a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java index 94d82477..9520afb6 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java +++ b/main/src/test/java/org/onap/policy/distribution/main/rest/TestHttpsStatisticDistributionRestServer.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Intel. All rights reserved. * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2020 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,6 +39,7 @@ import javax.ws.rs.core.MediaType; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.junit.Test; import org.onap.policy.common.utils.network.NetworkUtil; +import org.onap.policy.common.utils.security.SelfSignedKeyStore; import org.onap.policy.distribution.main.PolicyDistributionException; import org.onap.policy.distribution.main.parameters.CommonTestData; import org.onap.policy.distribution.main.startstop.Main; @@ -50,8 +51,6 @@ import org.onap.policy.distribution.main.startstop.Main; */ public class TestHttpsStatisticDistributionRestServer { - private static String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore"; - private int port; @Test @@ -64,10 +63,10 @@ public class TestHttpsStatisticDistributionRestServer { }).doesNotThrowAnyException(); } - private Main startDistributionService() throws IOException { + private Main startDistributionService() throws IOException, InterruptedException { final Properties systemProps = System.getProperties(); - systemProps.put("javax.net.ssl.keyStore", KEYSTORE); - systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap"); + systemProps.put("javax.net.ssl.keyStore", new SelfSignedKeyStore().getKeystoreName()); + systemProps.put("javax.net.ssl.keyStorePassword", SelfSignedKeyStore.KEYSTORE_PASSWORD); System.setProperties(systemProps); port = CommonTestData.makeConfigFile("parameters/DistributionConfigParameters_Https.json"); diff --git a/main/src/test/resources/ssl/policy-keystore b/main/src/test/resources/ssl/policy-keystore deleted file mode 100644 index b95e010318ac620b5d13b24a07839471edd34ce1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4431 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 diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/ssl/policy-keystore b/packages/policy-distribution-tarball/src/main/resources/etc/ssl/policy-keystore deleted file mode 100644 index b95e010318ac620b5d13b24a07839471edd34ce1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4431 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 -- 2.16.6