diff options
author | Bharath Balasubramanian <bharathb@research.att.com> | 2018-10-10 18:18:55 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-10-10 18:18:55 +0000 |
commit | a3df8478ac6c645e4c373c81656fd8408dfccfdd (patch) | |
tree | 1151eee1607965a16f2b179ddf2f75433b5e7e16 /jar/src/main/java/org/onap/music/main/MusicUtil.java | |
parent | b6aeb72637b313e09927b094efcfb56317e17021 (diff) | |
parent | a3cd1553531d81ca88b4d2f426fe527dd1e909a8 (diff) |
Merge "Update to support Encrypted password"
Diffstat (limited to 'jar/src/main/java/org/onap/music/main/MusicUtil.java')
-rwxr-xr-x | jar/src/main/java/org/onap/music/main/MusicUtil.java | 28 |
1 files changed, 20 insertions, 8 deletions
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 f18570db..77afb57e 100755 --- 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")); } + } |