From f4e724a45e3b00bbcb7ca5ab983cd7b7bb8e7356 Mon Sep 17 00:00:00 2001 From: "Bansal, Nitin (nb121v)" Date: Wed, 9 Jan 2019 14:47:39 -0500 Subject: supporting clear text and obfuscated client cert supporting clear text and obfuscated client cert Change-Id: I2e5332839993283446904ca6065d7ead8b29cb0f Issue-ID: AAI-2046 Signed-off-by: Bansal, Nitin (nb121v) --- src/main/java/org/onap/aai/rest/RestClientProducer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/onap/aai/rest/RestClientProducer.java b/src/main/java/org/onap/aai/rest/RestClientProducer.java index 24c8eee..4170525 100644 --- a/src/main/java/org/onap/aai/rest/RestClientProducer.java +++ b/src/main/java/org/onap/aai/rest/RestClientProducer.java @@ -241,10 +241,12 @@ public class RestClientProducer extends DefaultProducer { + " keystore=" + keystoreFilename + " keystorePassword=" + keystorePassword); } + String deobfuscatedCertPassword = keystorePassword.startsWith("OBF:")?Password.deobfuscate(keystorePassword):keystorePassword; + // Create REST client for search service restClient = new RestClient().validateServerHostname(false).validateServerCertChain(true) .clientCertFile(clientCertFilename) - .clientCertPassword(Password.deobfuscate(keystorePassword)).trustStore(keystoreFilename); + .clientCertPassword(deobfuscatedCertPassword).trustStore(keystoreFilename); } return restClient; -- cgit 1.2.3-korg