Merge "Resubmitting KeyProperties changes"

6 files changed, 47 insertions, 19 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java
index 58c6cd62..3a7baccd 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java
@@ -51,6 +51,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.objectcache.AbstractCacheManager;
 import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.onap.portalsdk.core.service.DataAccessService;
@@ -144,7 +146,7 @@ public class ResourceInterceptor extends HandlerInterceptorAdapter {
 		String decreptedPwd = null;
 		try {
 			decreptedPwd = CipherUtil.decryptPKC(app.getAppPassword(),
-					SystemProperties.getProperty(SystemProperties.Decryption_Key));
+					KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 		} catch (Exception e) {
 			logger.error(EELFLoggerDelegate.errorLogger, "handleSessionUpdates failed to decrypt password", e);
 		}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java
index d9b96284..8f1a26bb 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java
@@ -46,6 +46,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.exception.CipherUtilException;
 import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,7 +80,7 @@ public class RestApiRequestBuilder {
 			appUserName = app.getUsername();
 			try {
 				decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(),
-						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+						KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 			} catch (CipherUtilException e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "getViaREST failed", e);
 				throw new IOException("getViaREST failed", e);
@@ -116,7 +118,7 @@ public class RestApiRequestBuilder {
 			appUserName = app.getUsername();
 			try {
 				decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(),
-						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+						KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 			} catch (CipherUtilException e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "postViaREST failed", e);
 				throw new IOException("postViaREST failed", e);
@@ -153,7 +155,7 @@ public class RestApiRequestBuilder {
 			appUserName = app.getUsername();
 			try {
 				decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(),
-						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+						KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 			} catch (CipherUtilException e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "deleteViaRest failed", e);
 				throw new IOException("deleteViaRest failed", e);
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
index 9ed0f38c..7df80183 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
@@ -58,6 +58,8 @@ import org.onap.portalsdk.core.domain.User;
 import org.onap.portalsdk.core.domain.UserApp;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.portalsdk.external.authorization.domain.ExternalAccessPerms;
 import org.onap.portalsdk.external.authorization.domain.ExternalAccessRole;
@@ -265,7 +267,7 @@ public class UserApiServiceImpl implements UserApiService {
 		if (encrypted != null && encrypted.length() > 0) {
 			try {
 				result = CipherUtil.decryptPKC(encrypted,
-						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+						KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 			} catch (Exception e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e);
 				throw e;
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java
index 5582fd2e..a49be085 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java
@@ -42,6 +42,8 @@ import java.util.List;
 import org.onap.portalsdk.core.domain.App;
 import org.onap.portalsdk.core.onboarding.exception.CipherUtilException;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -70,7 +72,7 @@ public class WebServiceCallServiceImpl implements WebServiceCallService {
 			String encriptedPwdDB = app.getAppPassword();
 			String appUserName = app.getUsername();
 			String decreptedPwd = CipherUtil.decryptPKC(encriptedPwdDB,
-					secretKey == null ? SystemProperties.getProperty(SystemProperties.Decryption_Key) : secretKey);
+					secretKey == null ? KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY) : secretKey);
 			if (decreptedPwd.equals(requestPassword) && appUserName.equals(requestAppName)) {
 				return true;
 			}
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java
index 099f4c42..132ab546 100644
--- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java
@@ -48,13 +48,15 @@ import org.mockito.Mockito;
 import org.onap.portalsdk.core.domain.App;
 import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ SystemProperties.class, CipherUtil.class, RestWebServiceClient.class })
+@PrepareForTest({ SystemProperties.class, CipherUtil.class, RestWebServiceClient.class, KeyProperties.class, KeyConstants.class })
 public class RestApiRequestBuilderTest {
 
 	@InjectMocks
@@ -77,10 +79,12 @@ public class RestApiRequestBuilderTest {
 		String status = "SUCCESS";
 
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword());
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword());
 		PowerMockito.mockStatic(CipherUtil.class);
 		Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(),
-				SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn(app.getAppPassword());
+				KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn(app.getAppPassword());
 
 		PowerMockito.mockStatic(RestWebServiceClient.class);
 
@@ -110,7 +114,9 @@ public class RestApiRequestBuilderTest {
 		app.setAppPassword("Password");
 		
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword());
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword());
 		Mockito.when(appService.getDefaultApp()).thenReturn(app);
 
 		restApiRequestBuilder.getViaREST(restEndPoint, isBasicAuth, userId);
@@ -155,10 +161,12 @@ public class RestApiRequestBuilderTest {
 		String status = "SUCCESS";
 
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword());
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword());
 		PowerMockito.mockStatic(CipherUtil.class);
 		Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(),
-				SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn(app.getAppPassword());
+				KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn(app.getAppPassword());
 
 		PowerMockito.mockStatic(RestWebServiceClient.class);
 		RestWebServiceClient client = Mockito.mock(RestWebServiceClient.class);
@@ -187,7 +195,9 @@ public class RestApiRequestBuilderTest {
 		app.setAppPassword("Password");
 		
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword());
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword());
 		Mockito.when(appService.getDefaultApp()).thenReturn(app);
 		
 		restApiRequestBuilder.postViaREST(restEndPoint, isBasicAuth,content, userId);
@@ -230,10 +240,12 @@ public class RestApiRequestBuilderTest {
 		String status = "SUCCESS";
 
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword());
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword());
 		PowerMockito.mockStatic(CipherUtil.class);
 		Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(),
-				SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn(app.getAppPassword());
+				KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn(app.getAppPassword());
 
 		PowerMockito.mockStatic(RestWebServiceClient.class);
 		RestWebServiceClient client = Mockito.mock(RestWebServiceClient.class);
@@ -262,7 +274,9 @@ public class RestApiRequestBuilderTest {
 		app.setAppPassword("Password");
 		
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword());
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword());
 		Mockito.when(appService.getDefaultApp()).thenReturn(app);
 		
 		restApiRequestBuilder.deleteViaRest(restEndPoint, isBasicAuth,content, userId);
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java
index 69e9b410..89c2fabf 100644
--- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java
@@ -48,13 +48,15 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.onap.portalsdk.core.domain.App;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({CipherUtil.class, SystemProperties.class})
+@PrepareForTest({CipherUtil.class, SystemProperties.class, KeyProperties.class, KeyConstants.class})
 public class WebServiceCallServiceImplTest {
 
 	@InjectMocks
@@ -78,7 +80,9 @@ public class WebServiceCallServiceImplTest {
 		Mockito.when(appService.getDefaultApp()).thenReturn(app);
 		PowerMockito.mockStatic(CipherUtil.class);
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(secretKey);
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(secretKey);
 		Mockito.when(CipherUtil.decryptPKC(Mockito.anyString(), Mockito.anyString())).thenReturn(requestPassword);
 		webServiceCallServiceImpl.verifyRESTCredential(secretKey, requestAppName, requestPassword);
 		Assert.assertTrue(true);
@@ -95,7 +99,9 @@ public class WebServiceCallServiceImplTest {
 		Mockito.when(appService.getDefaultApp()).thenReturn(app);
 		PowerMockito.mockStatic(CipherUtil.class);
 		PowerMockito.mockStatic(SystemProperties.class);
-		Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn("Key");
+		PowerMockito.mockStatic(KeyProperties.class);
+		PowerMockito.mockStatic(KeyConstants.class);
+		Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn("Key");
 		Mockito.when(CipherUtil.decryptPKC(Mockito.anyString(), Mockito.anyString())).thenReturn("Key");
 		webServiceCallServiceImpl.verifyRESTCredential(secretKey, requestAppName, requestPassword);
 		Assert.assertFalse(false);