X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=LogParser%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fxacml%2Fparser%2FParseLog.java;h=77aafdf7a3c96ee27bbda4c4428f5db876d7bdb9;hb=e29f8129b7f012c1405f5be3bbb853116ce9df97;hp=54e86d2508568b65e4f4b90057b7fa2e9df07bcc;hpb=64d3d5f9d4fb225fde55598e5b7462978642c417;p=policy%2Fengine.git

diff --git a/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java b/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
index 54e86d250..77aafdf7a 100644
--- a/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
+++ b/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * LogParser
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,12 +45,11 @@ import java.util.Timer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-
 import org.apache.log4j.Logger;
 import org.onap.policy.common.im.IntegrityMonitor;
 import org.onap.policy.common.im.IntegrityMonitorException;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.utils.CryptoUtils;
+import org.onap.policy.utils.PeCryptoUtils;
 import org.onap.xacml.parser.LogEntryObject.LogType;
 
 /**
@@ -62,6 +61,7 @@ public class ParseLog {
 
     // only logging last line of each log file processed to the log4j log file defined by property - PARSERLOGPATH
     private static final Logger log4jlogger = Logger.getLogger(ParseLog.class.getName());
+    private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key";
 
     // processing logging
     private static org.onap.policy.common.logging.flexlogger.Logger logger =
@@ -393,7 +393,7 @@ public class ParseLog {
                     logger.debug("builder.toString(): " + builder.toString());
                     if (builder.toString().contains(last + dataFileName + lineRead)) {
                         final String[] parseString = builder.toString().split(last + dataFileName + lineRead);
-                        final String returnValue = parseString[1].replace("\r", "");                        
+                        final String returnValue = parseString[1].replace("\r", "");
                         return returnValue.trim();
                     }
                     builder = new StringBuilder();
@@ -884,11 +884,12 @@ public class ParseLog {
             setLogFileProperties(splitString);
 
             jdbcUrl = config.getProperty("JDBC_URL").replace("'", "");
-            jdbcUser = config.getProperty("JDBC_USER");
+            jdbcUser = getValue(config.getProperty("JDBC_USER"));
             jdbcDriver = config.getProperty("JDBC_DRIVER");
-            jdbcPassword = CryptoUtils.decryptTxtNoExStr(config.getProperty("JDBC_PASSWORD", ""));
-            config.setProperty("javax.persistence.jdbc.password",
-                    CryptoUtils.decryptTxtNoExStr(config.getProperty("javax.persistence.jdbc.password", "")));
+
+            PeCryptoUtils.initAesKey(config.getProperty(PROP_AES_KEY));
+            jdbcPassword = PeCryptoUtils.decrypt(getValue(config.getProperty("JDBC_PASSWORD")));
+            config.setProperty("javax.persistence.jdbc.password", jdbcPassword);
             return config;
 
         } catch (final IOException e) {
@@ -901,6 +902,13 @@ public class ParseLog {
         return null;
     }
 
+    private static String getValue(final String value) {
+        if (value != null && value.matches("[$][{].*[}]$")) {
+            return System.getenv(value.substring(2, value.length() - 1));
+        }
+        return value;
+    }
+
     public static Connection getDbConnection() {
         return dbConnection(jdbcDriver, jdbcUrl, jdbcUser, jdbcPassword);
     }