grm clients use encrypted auth loading

Change-Id: I328e7c0913acf3d84d4a51ba9b9237ec337b0ee1
Issue-ID: SO-1288
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>

6 files changed, 14 insertions, 263 deletions

diff --git a/common/src/main/java/org/onap/so/client/grm/GRMClient.java b/common/src/main/java/org/onap/so/client/grm/GRMClient.java
index 84e25b9ce4..653e1cc7b3 100644
--- a/common/src/main/java/org/onap/so/client/grm/GRMClient.java
+++ b/common/src/main/java/org/onap/so/client/grm/GRMClient.java
@@ -53,7 +53,7 @@ public class GRMClient {
 		}
 	}
 	
-	protected ServiceEndPointLookupRequest buildServiceEndPointlookupRequest(String name, int majorVersion, String env) {
+	public ServiceEndPointLookupRequest buildServiceEndPointlookupRequest(String name, int majorVersion, String env) {
 		VersionLookup version = new VersionLookup();
 		version.setMajor(majorVersion);
 		
diff --git a/common/src/main/java/org/onap/so/client/grm/GRMDefaultPropertiesImpl.java b/common/src/main/java/org/onap/so/client/grm/GRMDefaultPropertiesImpl.java
deleted file mode 100644
index b38072e769..0000000000
--- a/common/src/main/java/org/onap/so/client/grm/GRMDefaultPropertiesImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.grm;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.ws.rs.core.MediaType;
-
-public class GRMDefaultPropertiesImpl implements GRMProperties {
-	
-	public GRMDefaultPropertiesImpl() {
-	}
-
-	@Override
-	public URL getEndpoint() throws MalformedURLException {
-		return new URL("http://localhost:47389");
-	}
-
-	@Override
-	public String getSystemName() {
-		return "MSO";
-	}
-
-	@Override
-	public String getDefaultVersion() {
-		return "v1";
-	}
-
-	@Override
-	public String getUsername() {
-		return "gmruser";
-	}
-
-	@Override
-	public String getPassword() {
-		return "cGFzc3dvcmQ=";
-	}
-
-	@Override
-	public String getContentType() {
-		return MediaType.APPLICATION_JSON;
-	}
-
-}
diff --git a/common/src/main/java/org/onap/so/client/grm/GRMProperties.java b/common/src/main/java/org/onap/so/client/grm/GRMProperties.java
index da9f215aac..1206896bf9 100644
--- a/common/src/main/java/org/onap/so/client/grm/GRMProperties.java
+++ b/common/src/main/java/org/onap/so/client/grm/GRMProperties.java
@@ -24,7 +24,7 @@ import org.onap.so.client.RestProperties;
 
 public interface GRMProperties extends RestProperties {
 	public String getDefaultVersion();
-	public String getUsername();
-	public String getPassword();
+	public String getAuth();
+	public String getKey();
 	public String getContentType();
 }
diff --git a/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java b/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java
index ce16ccaaaa..0bb55e627a 100644
--- a/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java
+++ b/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java
@@ -32,13 +32,11 @@ import org.onap.so.utils.TargetEntity;
 
 public class GRMRestClient extends RestClient {
 
-	private final String username;
-	private final String password;
+	private final GRMProperties properties;
 	
-	public GRMRestClient(RestProperties props, URI path, String username, String password) {
-		super(props, Optional.of(path));
-		this.username = username;
-		this.password = password;
+	public GRMRestClient(GRMProperties props, URI path) {
+		super(props, Optional.of(path));		
+		this.properties = props;
 	}
 
     @Override
@@ -48,7 +46,12 @@ public class GRMRestClient extends RestClient {
 
 	@Override
 	protected void initializeHeaderMap(Map<String, String> headerMap) {
-		headerMap.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(new String(username + ":" + password).getBytes()));
+		String auth = properties.getAuth();
+		String key = properties.getKey();
+
+		if (auth != null && !auth.isEmpty() && key != null && !key.isEmpty()) {
+			addBasicAuthHeader(auth, key);
+		}	
 	}
 
 }
diff --git a/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java b/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java
index 3045cb35f4..0c95a66979 100644
--- a/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java
+++ b/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java
@@ -21,7 +21,6 @@
 package org.onap.so.client.grm;
 
 import java.net.URI;
-import java.util.Base64;
 
 import javax.ws.rs.core.UriBuilder;
 
@@ -34,11 +33,8 @@ public class GRMRestInvoker {
 	
 	public GRMRestInvoker(GRMAction action) {
 		GRMProperties props = GRMPropertiesLoader.getInstance().getImpl();
-		if (props == null) {
-			props = new GRMDefaultPropertiesImpl();
-		}
 		this.properties = props;
-		this.client = new GRMRestClient(this.properties, this.createURI(action), this.properties.getUsername(), this.decode(this.properties.getPassword()));
+		this.client = new GRMRestClient(properties, this.createURI(action));
 	}
 	
 	private URI createURI(GRMAction action) {
@@ -49,15 +45,6 @@ public class GRMRestInvoker {
 				.build();
 	}
 	
-	private String decode(String cred) {
-		try {
-			return new String(Base64.getDecoder().decode(cred.getBytes()));
-		} 
-		catch(IllegalArgumentException iae) {
-			return cred;
-		}
-	}
-	
 	private RestClient getClient() {
 		return this.client;
 	}
diff --git a/common/src/test/java/org/onap/so/client/grm/GRMClientTest.java b/common/src/test/java/org/onap/so/client/grm/GRMClientTest.java
deleted file mode 100644
index 388e89a438..0000000000
--- a/common/src/test/java/org/onap/so/client/grm/GRMClientTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.grm;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.matching;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
-
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.client.grm.beans.ServiceEndPoint;
-import org.onap.so.client.grm.beans.ServiceEndPointList;
-import org.onap.so.client.grm.beans.ServiceEndPointLookupRequest;
-import org.onap.so.client.grm.beans.ServiceEndPointRequest;
-import org.onap.so.client.grm.exceptions.GRMClientCallFailed;
-import org.onap.so.utils.TestAppender;
-import org.slf4j.MDC;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-public class GRMClientTest {
-	
-	@Rule
-	public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().port(47389));
-	
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-	
-	private static final String uuidRegex = "(?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-5][0-9a-f]{3}-?[089ab][0-9a-f]{3}-?[0-9a-f]{12}$";
-	
-	@BeforeClass
-	public static void setUp() throws Exception {
-		System.setProperty("mso.config.path", "src/test/resources");
-	}
-	
-	@Test
-	public void testFind() throws Exception {
-        TestAppender.events.clear();
-		String endpoints = getFileContentsAsString("__files/grm/endpoints.json");
-		wireMockRule.stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
-			.willReturn(aResponse()
-				.withStatus(200)
-				.withHeader("Content-Type", MediaType.APPLICATION_JSON)
-				.withBody(endpoints)));
-
-		MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, "/test");
-		GRMClient client = new GRMClient();
-		ServiceEndPointList sel = client.findRunningServices("TEST.ECOMP_PSL.*", 1, "TEST");
-		List<ServiceEndPoint> list = sel.getServiceEndPointList();
-		assertEquals(3, list.size());
-		
-		boolean foundInvoke = false;
-		boolean foundInvokeReturn = false;
-        for(ILoggingEvent logEvent : TestAppender.events)
-            if(logEvent.getLoggerName().equals("org.onap.so.logging.jaxrs.filter.JaxRsClientLogging") &&
-                    logEvent.getMarker().getName().equals("INVOKE")
-                    ){
-                Map<String,String> mdc = logEvent.getMDCPropertyMap();
-                assertNotNull(mdc.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-                assertEquals("GRM",mdc.get("TargetEntity"));
-                assertEquals("INPROGRESS",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
-                foundInvoke=true;
-            }else if(logEvent.getLoggerName().equals("org.onap.so.logging.jaxrs.filter.JaxRsClientLogging") &&
-                    logEvent.getMarker()!= null && logEvent.getMarker().getName().equals("INVOKE_RETURN")){
-                Map<String,String> mdc = logEvent.getMDCPropertyMap();
-                assertNotNull(mdc.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-                assertEquals("200",mdc.get(ONAPLogConstants.MDCs.RESPONSE_CODE));
-                assertEquals("COMPLETED",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
-                foundInvokeReturn=true;
-            }
-        
-        if(!foundInvoke)
-            fail("INVOKE Marker not found");
-        
-        if(!foundInvokeReturn)
-            fail("INVOKE RETURN Marker not found");
-        
-        verify(postRequestedFor(urlEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
-                .withHeader(ONAPLogConstants.Headers.INVOCATION_ID.toString(), matching(uuidRegex))
-                        .withHeader(ONAPLogConstants.Headers.REQUEST_ID.toString(), matching(uuidRegex))
-                                .withHeader(ONAPLogConstants.Headers.PARTNER_NAME.toString(), equalTo("SO")));
-        TestAppender.events.clear();
-	}
-	
-	@Test 
-	public void testFindFail() throws Exception {
-		
-		wireMockRule.stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
-			.willReturn(aResponse()
-				.withStatus(400)
-				.withHeader("Content-Type", MediaType.APPLICATION_JSON)
-				.withBody("")));
-		
-		GRMClient client = new GRMClient();
-		thrown.expect(GRMClientCallFailed.class);
-		client.findRunningServices("TEST.ECOMP_PSL.*", 1, "TEST");
-	}
-	
-	@Test
-	public void testAddFail() throws Exception {
-		wireMockRule.stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/add"))
-				.willReturn(aResponse()
-					.withStatus(404)
-					.withHeader("Content-Type", MediaType.APPLICATION_JSON)
-					.withBody("test")));
-		ServiceEndPointRequest request = new ServiceEndPointRequest();
-		GRMClient client = new GRMClient();
-		thrown.expect(GRMClientCallFailed.class);
-		client.addServiceEndPoint(request);
-	}
-
-	@Test
-	public void testBuildServiceEndPointLookupRequest() {
-		GRMClient client = new GRMClient();
-		ServiceEndPointLookupRequest request = client.buildServiceEndPointlookupRequest("TEST.ECOMP_PSL.Inventory", 1, "DEV");
-		assertEquals("TEST.ECOMP_PSL.Inventory", request.getServiceEndPoint().getName());
-		assertEquals(Integer.valueOf(1), Integer.valueOf(request.getServiceEndPoint().getVersion().getMajor()));
-		assertEquals("DEV", request.getEnv());
-		
-	}
-	
-	protected String getFileContentsAsString(String fileName) {
-		String content = "";
-		try {
-			ClassLoader classLoader = this.getClass().getClassLoader();
-			File file = new File(classLoader.getResource(fileName).getFile());
-			content = new String(Files.readAllBytes(file.toPath()));
-		}
-		catch(Exception e) {
-			e.printStackTrace();
-			System.out.println("Exception encountered reading " + fileName + ". Error: " + e.getMessage());
-		}
-		return content;
-	}
-}