From 52b79b57892d03dfe92b6423c77b8f51f0a1ca8d Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Tue, 19 Feb 2019 17:48:46 -0500 Subject: Added the conversion of decrypted value Added jUnit test for the conversion of decrypted value to Basic Base64Binary. Added the conversion of decrypted value as Basic Base64Binary. Change-Id: I361cbe3dac61df2728c9f58c314a21b3cc764a9f Issue-ID: SO-1531 Signed-off-by: Benjamin, Max (mb388a) --- .../main/java/org/onap/so/apihandlerinfra/ServiceInstances.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mso-api-handlers/mso-api-handler-infra/src/main/java') diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java index 312db9a338..e3b218b90a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java @@ -110,6 +110,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; +import javax.xml.bind.DatatypeConverter; import java.io.IOException; import java.net.URL; import java.security.GeneralSecurityException; @@ -1178,7 +1179,7 @@ public class ServiceInstances { String requestId = duplicateRecord.getRequestId(); String path = env.getProperty("mso.camunda.rest.history.uri") + requestId; String targetUrl = env.getProperty("mso.camundaURL") + path; - HttpHeaders headers = setHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey")); + HttpHeaders headers = setCamundaHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey")); HttpEntity requestEntity = new HttpEntity<>(headers); ResponseEntity> response = null; try{ @@ -1202,7 +1203,7 @@ public class ServiceInstances { } return false; } - private HttpHeaders setHeaders(String auth, String msoKey) { + protected HttpHeaders setCamundaHeaders(String auth, String msoKey) { HttpHeaders headers = new HttpHeaders(); List acceptableMediaTypes = new ArrayList<>(); acceptableMediaTypes.add(org.springframework.http.MediaType.APPLICATION_JSON); @@ -1210,7 +1211,7 @@ public class ServiceInstances { try { String userCredentials = CryptoUtils.decrypt(auth, msoKey); if(userCredentials != null) { - headers.add(HttpHeaders.AUTHORIZATION, userCredentials); + headers.add(HttpHeaders.AUTHORIZATION, "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes())); } } catch(GeneralSecurityException e) { msoLogger.error("Security exception", e); -- cgit 1.2.3-korg