diff options
| author |   Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2019-01-04 11:17:11 -0500 |
|---|---|---|
| committer | Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2019-01-04 11:21:28 -0500 |
| commit | 970630f8d7d963a0ddaf28e8760dea28a24676aa (patch) | |
| tree | 2156c1d9ce46ac0cfdc528f0c0683f1926bdc1ef | |
| parent | f683bb625823de20ae1085753265ddd72febcb74 (diff) | |
set server truststore params optionally in search
Change-Id: Ic9359d0eea2a0c57a7b17397a8f681aba765f893
Issue-ID: AAI-2046
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
| -rw-r--r-- | src/main/bin/start.sh | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/aai/sa/Application.java | 12 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 69550c6..5248a7a 100644 --- 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 --- 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");
}
HashMap<String, Object> props = new HashMap<>();
- props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));
+ String deobfuscatedKeyStorePassword = keyStorePassword.startsWith("OBF:") ? Password.deobfuscate(keyStorePassword) : keyStorePassword;
+ props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);
+
+ String trustStoreLocation = System.getProperty("TRUST_STORE_LOCATION");
+ String trustStorePassword = System.getProperty("TRUST_STORE_PASSWORD");
+ if (trustStoreLocation != null && trustStorePassword != null) {
+ trustStorePassword = trustStorePassword.startsWith("OBF:") ? Password.deobfuscate(trustStorePassword) : trustStorePassword;
+ props.put("server.ssl.trust-store", trustStoreLocation);
+ props.put("server.ssl.trust-store-password", trustStorePassword);
+ }
+
new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);
}
}
|