summaryrefslogtreecommitdiffstats
path: root/appc-adapters
diff options
context:
space:
mode:
authorJoss Armstrong <joss.armstrong@ericsson.com>2018-12-17 13:12:45 +0000
committerJoss Armstrong <joss.armstrong@ericsson.com>2018-12-17 13:13:17 +0000
commit74553eb3428822f57b868e3769ac23d2e7394df4 (patch)
tree28575267b80132463f10091ebf4b822c95cc068b /appc-adapters
parent6306c267967ad2e93d4f9d933d383005356439c1 (diff)
Fix for OOM-1538
This is APPC code change, values.yaml in OOM project also requires update. This is using EncryptionTool class already present in APPC for decryption of password. Alternative may be to use the CryptoUtils class from SO to have common encrypted string? Issue-ID: OOM-1538 Change-Id: I8201dd2587604c19ac584c7af1a9281ab96340d2 Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
Diffstat (limited to 'appc-adapters')
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java
index 851ec1a3f..0d7f05303 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java
@@ -31,6 +31,7 @@ import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
import org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer;
import org.onap.appc.configuration.Configuration;
import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.encryption.EncryptionTool;
import org.onap.appc.exceptions.APPCException;
import org.onap.appc.util.StructuredPropertyHelper;
import org.onap.appc.util.StructuredPropertyHelper.Node;
@@ -286,7 +287,8 @@ public class ProviderAdapterImpl implements ProviderAdapter {
DEFAULT_USER = node2.getValue();
break;
case Property.PROVIDER_TENANT_PASSWORD:
- password = node2.getValue();
+ // convert password from Base64 encrypted string prefixed with 'enc:'
+ password = EncryptionTool.getInstance().encrypt(node2.getValue());
DEFAULT_PASS = node2.getValue();
break;
case Property.PROVIDER_TENANT_DOMAIN: