From ff2317db56215b6b3f4d69a975a3c37823e9c391 Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Wed, 16 Sep 2020 10:44:03 -0400 Subject: Remove base64 encoding of password from api Remove base64 encoding of db password from policy-api component. Issue-ID: POLICY-2550 Change-Id: If395896f88f56f0284187f23d90ec5e0252ea17f Signed-off-by: Ram Krishna Verma --- .../test/java/org/onap/policy/api/main/rest/TestApiRestServer.java | 3 +-- .../org/onap/policy/api/main/rest/provider/TestPolicyProvider.java | 3 +-- .../onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java | 4 ++-- packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json | 4 ++-- packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json | 4 ++-- pom.xml | 3 ++- .../src/main/resources/apisetup/config/api/etc/defaultConfig.json | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java index 78a52872..ca0b0f6a 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java @@ -35,7 +35,6 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import java.security.SecureRandom; -import java.util.Base64; import java.util.Collections; import java.util.List; import java.util.Map; @@ -191,7 +190,7 @@ public class TestApiRestServer { providerParams.setDatabaseDriver("org.h2.Driver"); providerParams.setDatabaseUrl("jdbc:h2:mem:testdb"); providerParams.setDatabaseUser("policy"); - providerParams.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes())); + providerParams.setDatabasePassword("P01icY"); providerParams.setPersistenceUnit("ToscaConceptTest"); apiParamGroup = new ApiParameterGroup("ApiGroup", null, providerParams, Collections.emptyList(), Collections.emptyList()); diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java index 6e742c9b..8d991792 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java @@ -33,7 +33,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.util.ArrayList; -import java.util.Base64; import java.util.Collections; import java.util.List; import org.junit.After; @@ -104,7 +103,7 @@ public class TestPolicyProvider { providerParams.setDatabaseDriver("org.h2.Driver"); providerParams.setDatabaseUrl("jdbc:h2:mem:testdb"); providerParams.setDatabaseUser("policy"); - providerParams.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes())); + providerParams.setDatabasePassword("P01icY"); providerParams.setPersistenceUnit("ToscaConceptTest"); apiParamGroup = new ApiParameterGroup("ApiGroup", null, providerParams, Collections.emptyList(), Collections.emptyList()); diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java index 17d2cb94..5c7c25a9 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Bell Canada. 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. @@ -28,7 +29,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import java.util.Base64; import java.util.Collections; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -88,7 +88,7 @@ public class TestPolicyTypeProvider { providerParams.setDatabaseDriver("org.h2.Driver"); providerParams.setDatabaseUrl("jdbc:h2:mem:testdb"); providerParams.setDatabaseUser("policy"); - providerParams.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes())); + providerParams.setDatabasePassword("P01icY"); providerParams.setPersistenceUnit("ToscaConceptTest"); apiParamGroup = new ApiParameterGroup("ApiGroup", null, providerParams, Collections.emptyList(), Collections.emptyList()); diff --git a/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json index 997959f3..1ffc1d60 100644 --- a/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json +++ b/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json @@ -6,7 +6,7 @@ "userName": "healthcheck", "password": "zb!XztG34", "https": true, - "aaf": false + "aaf": false }, "databaseProviderParameters": { "name": "PolicyProviderParameterGroup", @@ -14,7 +14,7 @@ "databaseDriver": "org.mariadb.jdbc.Driver", "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin", "databaseUser": "policy_user", - "databasePassword": "cG9saWN5X3VzZXI=", + "databasePassword": "policy_user", "persistenceUnit": "PolicyMariaDb" }, "preloadPolicyTypes": [ diff --git a/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json index 997959f3..1ffc1d60 100644 --- a/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json +++ b/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json @@ -6,7 +6,7 @@ "userName": "healthcheck", "password": "zb!XztG34", "https": true, - "aaf": false + "aaf": false }, "databaseProviderParameters": { "name": "PolicyProviderParameterGroup", @@ -14,7 +14,7 @@ "databaseDriver": "org.mariadb.jdbc.Driver", "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin", "databaseUser": "policy_user", - "databasePassword": "cG9saWN5X3VzZXI=", + "databasePassword": "policy_user", "persistenceUnit": "PolicyMariaDb" }, "preloadPolicyTypes": [ diff --git a/pom.xml b/pom.xml index 1919ed38..dd6d25f1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved. Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019-2020 Nordix Foundation. + Modifications Copyright (C) 2020 Bell Canada. 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. @@ -42,7 +43,7 @@ 1.7.1 - 2.3.1 + 2.3.2-SNAPSHOT diff --git a/testsuites/stability/src/main/resources/apisetup/config/api/etc/defaultConfig.json b/testsuites/stability/src/main/resources/apisetup/config/api/etc/defaultConfig.json index 532963dc..0ea92201 100644 --- a/testsuites/stability/src/main/resources/apisetup/config/api/etc/defaultConfig.json +++ b/testsuites/stability/src/main/resources/apisetup/config/api/etc/defaultConfig.json @@ -14,7 +14,7 @@ "databaseDriver": "org.mariadb.jdbc.Driver", "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin", "databaseUser": "policy_user", - "databasePassword": "cG9saWN5X3VzZXI=", + "databasePassword": "policy_user", "persistenceUnit": "PolicyMariaDb" }, "preloadPolicyTypes": [ -- cgit 1.2.3-korg