Update to support Encrypted password

[music.git] / jar / src / main / java / org / onap / music / main / MusicUtil.java

diff --git a/jar/src/main/java/org/onap/music/main/MusicUtil.java b/jar/src/main/java/org/onap/music/main/MusicUtil.java
index f18570d..77afb57 100755 (executable)
--- a/jar/src/main/java/org/onap/music/main/MusicUtil.java
+++ b/jar/src/main/java/org/onap/music/main/MusicUtil.java
@@ -531,14 +531,15 @@ public class MusicUtil {
 
     
     public static void loadProperties() throws Exception {
-               Properties prop = new Properties();
+       CipherUtil.readAndSetKeyString();
+        Properties prop = new Properties();
            InputStream input = null;
            try {
-               // load the properties file
+               // load the properties file
                input = MusicUtil.class.getClassLoader().getResourceAsStream("music.properties");
                prop.load(input);
            } catch (Exception ex) {
-               logger.error(EELFLoggerDelegate.errorLogger, "Unable to find properties file.");
+               logger.error(EELFLoggerDelegate.errorLogger, "Unable to find properties file.");
                throw new Exception();
            } finally {
                if (input != null) {
@@ -549,12 +550,23 @@ public class MusicUtil {
                    }
                }
            }
+           String cassPwd = prop.getProperty("cassandra.password");
+           String isEncrypted = prop.getProperty("cassandra.password.isencrypted");
+           logger.info(EELFLoggerDelegate.applicationLogger,"cassandra.password:" + cassPwd);
+           logger.info(EELFLoggerDelegate.applicationLogger,"cassandra.password.isencrypted:" + isEncrypted);
+           if("true".equals(isEncrypted)) {
+               logger.info(EELFLoggerDelegate.applicationLogger,"Decrypting....");
+               cassPwd = CipherUtil.decryptPKC(cassPwd);
+               logger.info(EELFLoggerDelegate.applicationLogger,"Decrypted password: "+cassPwd);
+               MusicUtil.setCassPwd(cassPwd);
+           } else
+               MusicUtil.setCassPwd(cassPwd);
            // get the property value and return it
-               MusicUtil.setMyCassaHost(prop.getProperty("cassandra.host"));
-               String zkHosts = prop.getProperty("zookeeper.host");
-               MusicUtil.setMyZkHost(zkHosts);
-               MusicUtil.setCassName(prop.getProperty("cassandra.user"));
-               MusicUtil.setCassPwd(prop.getProperty("cassandra.password"));
+               MusicUtil.setMyCassaHost(prop.getProperty("cassandra.host"));
+               String zkHosts = prop.getProperty("zookeeper.host");
+               MusicUtil.setMyZkHost(zkHosts);
+               MusicUtil.setCassName(prop.getProperty("cassandra.user"));
        }
+
     
 }