From a94ccb7d0cd952a6cce4ac87051375638bfbe464 Mon Sep 17 00:00:00 2001 From: "Boslet, Cory" Date: Fri, 14 Jun 2019 09:44:54 -0400 Subject: dmaap client using wrong auth property Changed dmaap client to set auth property correctly to prevent double decryting and wrong value Change-Id: I83dc8c67e94a8bec187c056e7dfa1f966cc5ee3c Issue-ID: SO-2019 Signed-off-by: Benjamin, Max (mb388a) --- common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'common/src/main') diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java b/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java index 86d4aa7413..48c2d1495d 100644 --- a/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java +++ b/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java @@ -49,12 +49,12 @@ public abstract class DmaapClient { this.msoProperties = dmaapProperties.getProperties(); this.properties = new Properties(); this.properties.load(resource.getInputStream()); - try { - this.properties.put("auth", CryptoUtils.decrypt(this.getAuth(), this.getKey()).getBytes()); - } catch (GeneralSecurityException e) { - logger.error(e.getMessage(), e); + if (this.getAuth() != null && this.getKey() != null) { + this.properties.put("auth", this.getAuth()); + this.properties.put("key", this.getKey()); + } else { + logger.error("Dmaap auth or key is null"); } - this.properties.put("key", this.getKey()); this.properties.put("topic", this.getTopic()); Optional host = this.getHost(); if (host.isPresent()) { -- cgit 1.2.3-korg