set server truststore params optionally in search

Change-Id: Ic9359d0eea2a0c57a7b17397a8f681aba765f893
Issue-ID: AAI-2046
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 69550c6..5248a7a 100644 (file)
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -20,6 +20,14 @@ PROPS="$PROPS -Dlogging.config=$BASEDIR/bundleconfig/etc/logback.xml"
 PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
 PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD"
 
+if [ ! -z "$TRUST_STORE_PASSWORD" ]; then
+   PROPS="$PROPS -DTRUST_STORE_PASSWORD=${TRUST_STORE_PASSWORD}"
+fi
+
+if [ ! -z "$TRUST_STORE_LOCATION" ]; then
+   PROPS="$PROPS -DTRUST_STORE_LOCATION=${TRUST_STORE_LOCATION}"
+fi
+
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
 
 java $PROPS -jar $BASEDIR/search-data-service-package.jar
\ No newline at end of file

diff --git a/src/main/java/org/onap/aai/sa/Application.java b/src/main/java/org/onap/aai/sa/Application.java
index 620dbee..f2b8db1 100644 (file)
--- a/src/main/java/org/onap/aai/sa/Application.java
+++ b/src/main/java/org/onap/aai/sa/Application.java
@@ -35,7 +35,17 @@ public class Application extends SpringBootServletInitializer {
             throw new RuntimeException("Env property KEY_STORE_PASSWORD not set");\r
         }\r
         HashMap<String, Object> props = new HashMap<>();\r
-        props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));\r
+        String deobfuscatedKeyStorePassword = keyStorePassword.startsWith("OBF:") ? Password.deobfuscate(keyStorePassword) : keyStorePassword;\r
+        props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);\r
+\r
+        String trustStoreLocation = System.getProperty("TRUST_STORE_LOCATION");\r
+        String trustStorePassword = System.getProperty("TRUST_STORE_PASSWORD");\r
+        if (trustStoreLocation != null && trustStorePassword != null) {\r
+            trustStorePassword = trustStorePassword.startsWith("OBF:") ? Password.deobfuscate(trustStorePassword) : trustStorePassword;\r
+            props.put("server.ssl.trust-store", trustStoreLocation);\r
+            props.put("server.ssl.trust-store-password", trustStorePassword);\r
+        }\r
+\r
         new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);\r
     }\r
 }\r