Code Review
/
aai
/
gizmo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
supporting clear text and obfuscated client cert
[aai/gizmo.git]
/
src
/
main
/
java
/
org
/
onap
/
crud
/
dao
/
DataRouterDAO.java
diff --git
a/src/main/java/org/onap/crud/dao/DataRouterDAO.java
b/src/main/java/org/onap/crud/dao/DataRouterDAO.java
index
e5b6d5a
..
df57beb
100644
(file)
--- a/
src/main/java/org/onap/crud/dao/DataRouterDAO.java
+++ b/
src/main/java/org/onap/crud/dao/DataRouterDAO.java
@@
-29,9
+29,10
@@
import org.onap.crud.util.CrudServiceConstants;
public class DataRouterDAO extends ChampDao {
public DataRouterDAO(String url, String certPassword) {
try {
public class DataRouterDAO extends ChampDao {
public DataRouterDAO(String url, String certPassword) {
try {
+ String deobfuscatedCertPassword = certPassword.startsWith("OBF:")?Password.deobfuscate(certPassword):certPassword;
client = new RestClient().authenticationMode(RestAuthenticationMode.SSL_CERT).validateServerHostname(false)
.validateServerCertChain(false).clientCertFile(CrudServiceConstants.CRD_DATAROUTER_AUTH_FILE)
client = new RestClient().authenticationMode(RestAuthenticationMode.SSL_CERT).validateServerHostname(false)
.validateServerCertChain(false).clientCertFile(CrudServiceConstants.CRD_DATAROUTER_AUTH_FILE)
- .clientCertPassword(Password.deobfuscate(
c
ertPassword));
+ .clientCertPassword(Password.deobfuscate(
deobfuscatedC
ertPassword));
baseObjectUrl = url + OBJECT_SUB_URL;
baseRelationshipUrl = url + RELATIONSHIP_SUB_URL;
baseObjectUrl = url + OBJECT_SUB_URL;
baseRelationshipUrl = url + RELATIONSHIP_SUB_URL;