diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-03-22 12:35:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-22 12:35:14 +0000 |
| commit | 84f2e32a33d3306e8248f5afd496ebbfc111c210 (patch) | |
| tree | e12e79fa05498c7639e6252359e809152ed9bd1e /bpmn | |
| parent | 1d6e98e42d96242035db4a7b02f7aac9656a636b (diff) | |
| parent | 5a3ba18ea7ee971571575a0ce62f5e32975bd32d (diff) | |
Merge "CII badging issue resolution"
Diffstat (limited to 'bpmn')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java | 10 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/resources/urn.properties | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java index 787453ed28..13cff65018 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java @@ -20,21 +20,25 @@ */
package org.openecomp.mso.bpmn.common.util;
-
+import java.io.IOException;
import java.security.GeneralSecurityException;
import org.openecomp.mso.logger.MsoLogger;
+import java.util.Properties;
public class CryptoHandler implements ICryptoHandler {
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private static String msoKey = "aa3871669d893c7fb8abbcda31b88b4f";
- private static String msoAaiEncryptedPwd = "C1FC4A39E16419DD41DFC1212843F440";
+ private static String msoAaiEncryptedPwd;
@Override
public String getMsoAaiPassword() {
+ Properties keyProp = new Properties ();
try {
+ keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("urn.properties"));
+ msoAaiEncryptedPwd =(String) keyProp.get ("mso.AaiEncrypted.Pwd");
return CryptoUtils.decrypt(msoAaiEncryptedPwd, msoKey);
- } catch (GeneralSecurityException e) {
+ } catch (GeneralSecurityException | IOException e) {
LOGGER.debug("GeneralSecurityException :",e);
return null;
}
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/urn.properties b/bpmn/MSOCommonBPMN/src/main/resources/urn.properties index 5bf8e24815..12253aa9d2 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/urn.properties +++ b/bpmn/MSOCommonBPMN/src/main/resources/urn.properties @@ -27,3 +27,4 @@ AAIEndPoint= http://localhost:28090/ SDNCEndPoint=http://localhost:28090/SDNCAdapter/ msoRollback = true +mso.AaiEncrypted.Pwd = C1FC4A39E16419DD41DFC1212843F440 |