diff options
| -rw-r--r-- | src/main/bin/start.sh | 9 | ||||
| -rw-r--r-- | src/main/java/org/onap/crud/CrudApplication.java | 16 |
2 files changed, 24 insertions, 1 deletions
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index f456ae6..87ec099 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -21,6 +21,15 @@ PROPS="-DAPP_HOME=$APP_HOME" PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME" PROPS="$PROPS -Dlogging.config=$APP_HOME/bundleconfig/etc/logback.xml" 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} set -x diff --git a/src/main/java/org/onap/crud/CrudApplication.java b/src/main/java/org/onap/crud/CrudApplication.java index b91794d..2396d9e 100644 --- a/src/main/java/org/onap/crud/CrudApplication.java +++ b/src/main/java/org/onap/crud/CrudApplication.java @@ -54,10 +54,22 @@ public class CrudApplication extends SpringBootServletInitializer{// NOSONAR throw new RuntimeException("Env property KEY_STORE_PASSWORD not set"); } HashMap<String, Object> props = new HashMap<>(); - String deobfuscatedKeyStorePassword = 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); + } + props.put("schema.service.ssl.key-store-password", deobfuscatedKeyStorePassword); props.put("schema.service.ssl.trust-store-password", deobfuscatedKeyStorePassword); + + + new CrudApplication() .configure(new SpringApplicationBuilder(CrudApplication.class).properties(props)) .run(args); @@ -89,4 +101,6 @@ public class CrudApplication extends SpringBootServletInitializer{// NOSONAR return new Docket(DocumentationType.SWAGGER_2).apiInfo(DEFAULT_API_INFO).select().paths(PathSelectors.any()) .apis(RequestHandlerSelectors.basePackage("org.onap.crud")).build(); } + + } |