supporting clear text and obfuscated client cert

[aai/gizmo.git] / src / main / java / org / onap / crud / dao / champ / ChampDao.java

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 8563807..e6fb161 100644 (file)
--- a/src/main/java/org/onap/crud/dao/champ/ChampDao.java
+++ b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
@@ -74,9 +74,10 @@ public class ChampDao implements GraphDao {
 
   public ChampDao(String champUrl, String certPassword) {
     try {
+      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(certPassword));
+          .clientCertPassword(Password.deobfuscate(deobfuscatedCertPassword));
 
       baseObjectUrl = champUrl + OBJECT_SUB_URL;
       baseRelationshipUrl = champUrl + RELATIONSHIP_SUB_URL;