Code Review
/
aai
/
model-loader.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Handle non-obfuscated config
[aai/model-loader.git]
/
src
/
main
/
java
/
org
/
onap
/
aai
/
modelloader
/
config
/
ModelLoaderConfig.java
diff --git
a/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
index
c81f0dc
..
1d4f854
100644
(file)
--- a/
src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
+++ b/
src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
@@
-172,7
+172,7
@@
public class ModelLoaderConfig implements IConfiguration {
@Override
public String getKeyStorePassword() {
@Override
public String getKeyStorePassword() {
- return
Password.deobfuscat
e(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD));
+ return
getDeobfuscatedValu
e(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD));
}
@Override
}
@Override
@@
-182,7
+182,7
@@
public class ModelLoaderConfig implements IConfiguration {
@Override
public String getPassword() {
@Override
public String getPassword() {
- return
Password.deobfuscat
e(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_PASSWORD));
+ return
getDeobfuscatedValu
e(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_PASSWORD));
}
@Override
}
@Override
@@
-235,11
+235,11
@@
public class ModelLoaderConfig implements IConfiguration {
}
public String getAaiKeyStorePassword() {
}
public String getAaiKeyStorePassword() {
- return
Password.deobfuscat
e(modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_PASSWORD));
+ return
getDeobfuscatedValu
e(modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_PASSWORD));
}
public String getBabelKeyStorePassword() {
}
public String getBabelKeyStorePassword() {
- return
Password.deobfuscat
e(modelLoaderProperties.getProperty(PROP_BABEL_KEYSTORE_PASSWORD));
+ return
getDeobfuscatedValu
e(modelLoaderProperties.getProperty(PROP_BABEL_KEYSTORE_PASSWORD));
}
public String getBabelTrustStorePath() {
}
public String getBabelTrustStorePath() {
@@
-252,7
+252,7
@@
public class ModelLoaderConfig implements IConfiguration {
}
public String getBabelTrustStorePassword() {
}
public String getBabelTrustStorePassword() {
- return
Password.deobfuscat
e(modelLoaderProperties.getProperty(PROP_BABEL_TRUSTSTORE_PASSWORD));
+ return
getDeobfuscatedValu
e(modelLoaderProperties.getProperty(PROP_BABEL_TRUSTSTORE_PASSWORD));
}
public String getAaiBaseUrl() {
}
public String getAaiBaseUrl() {
@@
-301,7
+301,7
@@
public class ModelLoaderConfig implements IConfiguration {
* @return password for AAI authentication that has been reverse-engineered from its obfuscated form.
*/
public String getAaiAuthenticationPassword() {
* @return password for AAI authentication that has been reverse-engineered from its obfuscated form.
*/
public String getAaiAuthenticationPassword() {
- String password =
Password.deobfuscat
e(modelLoaderProperties.getProperty(PROP_AAI_AUTHENTICATION_PASSWORD));
+ String password =
getDeobfuscatedValu
e(modelLoaderProperties.getProperty(PROP_AAI_AUTHENTICATION_PASSWORD));
if (password != null && password.isEmpty()) {
password = null;
if (password != null && password.isEmpty()) {
password = null;
@@
-337,4
+337,12
@@
public class ModelLoaderConfig implements IConfiguration {
}
}
+ private String getDeobfuscatedValue(String property) {
+ if (property.startsWith("OBF:")) {
+ return Password.deobfuscate(property);
+ }
+
+ // Property is not obfuscated
+ return property;
+ }
}
}