diff options
| author |   Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com> | 2018-11-28 15:02:51 -0500 |
|---|---|---|
| committer | Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com> | 2018-11-28 15:03:49 -0500 |
| commit | 3f66d5f1ef60c60116589e73ec1207f9574840af (patch) | |
| tree | 4c3d54c9933ae5deb09d05d93f4d949515e5420b /src/main/java/org/onap | |
| parent | efc67e7a519560ff3e26de18f2f973d884bfbfc7 (diff) | |
support clear text/jetty obfuscated password
support clear text/jetty obfuscated password for talking to secure Elastic search
Change-Id: I864320f3884da1171b7c7980edbe8858197afc97
Issue-ID: AAI-1971
Signed-off-by: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap')
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java index f5cb9da..0d116f8 100644 --- a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java @@ -189,7 +189,11 @@ public class ElasticSearchConfig { Optional<String> passwordValue = Optional.ofNullable(props.getProperty(ES_TRUST_STORE_ENC)); if (passwordValue.isPresent()) { + if(passwordValue.get().startsWith("OBF:")){ setTrustStorePassword(Password.deobfuscate(passwordValue.get())); + }else{ + setTrustStorePassword(passwordValue.get()); + } } Optional<String> keyStoreFile = Optional.ofNullable(props.getProperty(ES_KEY_STORE)); @@ -199,7 +203,11 @@ public class ElasticSearchConfig { passwordValue = Optional.ofNullable(props.getProperty(ES_KEY_STORE_ENC)); if (passwordValue.isPresent()) { + if(passwordValue.get().startsWith("OBF:")){ setKeyStorePassword(Password.deobfuscate(passwordValue.get())); + }else{ + setKeyStorePassword(passwordValue.get()); + } } } diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java index 716814b..759c997 100644 --- a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java @@ -1397,7 +1397,8 @@ public class ElasticSearchHttpController implements DocumentStoreInterface { metricsLogger.info(message, new LogFields() // .setField(LogLine.DefinedFields.RESPONSE_CODE, operationResult.getResultCode()) - .setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, operationResult.getResult()), + .setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, operationResult.getResult()) + .setField(LogLine.DefinedFields.SERVER_IP, "ElasticHost-"+config.getIpAddress()), override, args); } } |