supporting clear text and obfuscated client cert

supporting clear text and obfuscated client cert

Change-Id: I6a048309982662c6b78b561cb0db18627d6e294f
Issue-ID: AAI-2046
Signed-off-by: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>

diff --git a/src/main/java/org/onap/crud/dao/DataRouterDAO.java b/src/main/java/org/onap/crud/dao/DataRouterDAO.java
index df57beb..f8dea8c 100644 (file)
--- a/src/main/java/org/onap/crud/dao/DataRouterDAO.java
+++ b/src/main/java/org/onap/crud/dao/DataRouterDAO.java
@@ -32,7 +32,7 @@ public class DataRouterDAO extends ChampDao {
       String deobfuscatedCertPassword = certPassword.startsWith("OBF:")?Password.deobfuscate(certPassword):certPassword;
       client = new RestClient().authenticationMode(RestAuthenticationMode.SSL_CERT).validateServerHostname(false)
           .validateServerCertChain(false).clientCertFile(CrudServiceConstants.CRD_DATAROUTER_AUTH_FILE)
-          .clientCertPassword(Password.deobfuscate(deobfuscatedCertPassword));
+          .clientCertPassword(deobfuscatedCertPassword);
 
       baseObjectUrl = url + OBJECT_SUB_URL;
       baseRelationshipUrl = url + RELATIONSHIP_SUB_URL;

diff --git a/src/main/java/org/onap/crud/dao/champ/ChampDao.java b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
index e6fb161..0a9adc4 100644 (file)
--- a/src/main/java/org/onap/crud/dao/champ/ChampDao.java
+++ b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
@@ -77,7 +77,7 @@ public class ChampDao implements GraphDao {
       String deobfuscatedCertPassword = certPassword.startsWith("OBF:")?Password.deobfuscate(certPassword):certPassword;
       client = new RestClient().authenticationMode(RestAuthenticationMode.SSL_CERT).validateServerHostname(false)
           .validateServerCertChain(false).clientCertFile(CrudServiceConstants.CRD_CHAMP_AUTH_FILE)
-          .clientCertPassword(Password.deobfuscate(deobfuscatedCertPassword));
+          .clientCertPassword(deobfuscatedCertPassword);
 
       baseObjectUrl = champUrl + OBJECT_SUB_URL;
       baseRelationshipUrl = champUrl + RELATIONSHIP_SUB_URL;