aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorBansal, Nitin (nb121v) <nitin.bansal@amdocs.com>2018-12-31 15:23:14 -0500
committerBansal, Nitin (nb121v) <nitin.bansal@amdocs.com>2018-12-31 15:56:11 -0500
commit995c51941dbc80a69bdc01ea56c86219d3c73eaf (patch)
tree92f311c4fe1d88231ec184c7ccd687fbd6e6e320 /src/main/java
parenta9b88265c2e66103d251ff7d26655f701cd13266 (diff)
set server truststore params optionally in gizmo
set server truststore params optionally in Gizmo Change-Id: I4908e44ca70a994c9112816d33714a0d6db61e27 Issue-ID: AAI-2046 Signed-off-by: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/crud/CrudApplication.java16
1 files changed, 15 insertions, 1 deletions
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();
}
+
+
}