X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Finterceptor%2FPortalResourceInterceptor.java;h=25ca5e652b262400abf96120b79ed14c54e678be;hb=2845910b34682056c1949f82e39d9205a26554e9;hp=fcd176393f38508f75861221c43d7ed0d7ee8b91;hpb=485296388748c1efb5737cf7ae9d4a8254681552;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
index fcd17639..25ca5e65 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
@@ -49,20 +49,20 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.codec.binary.Hex;
 import org.onap.portalapp.controller.sessionmgt.SessionCommunicationController;
 import org.onap.portalapp.portal.controller.BasicAuthenticationController;
 import org.onap.portalapp.portal.controller.ExternalAppsRestfulController;
 import org.onap.portalapp.portal.controller.SharedContextRestController;
 import org.onap.portalapp.portal.controller.WebAnalyticsExtAppController;
 import org.onap.portalapp.portal.domain.BasicAuthCredentials;
+import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPEndpoint;
-import org.onap.portalapp.portal.domain.EPRole;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
 import org.onap.portalapp.portal.logging.format.EPAppMessagesEnum;
 import org.onap.portalapp.portal.logging.logic.EPLogUtil;
 import org.onap.portalapp.portal.service.BasicAuthenticationCredentialService;
+import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.service.RemoteWebServiceCallService;
 import org.onap.portalapp.service.sessionmgt.ManageService;
@@ -94,6 +94,8 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 
 	@Autowired
 	private BasicAuthenticationCredentialService basicAuthService;
+	@Autowired
+	private ExternalAccessRolesService externalAccessRolesService;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -225,7 +227,8 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 		uri = uri.substring(uri.indexOf("/", 1));
 
 		final String authHeader = request.getHeader("Authorization");
-
+		final String uebkey = request.getHeader("uebkey");
+		
 		// Unauthorized access due to missing HTTP Authorization request header
 		if (authHeader == null) {
 			final String msg = "no authorization found";
@@ -242,6 +245,26 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 			return false;
 		}
 
+		if(uebkey !=null && !uebkey.isEmpty())
+		{
+			List<EPApp> app = externalAccessRolesService.getApp(uebkey);
+			EPApp application = null;
+			if (app.isEmpty()) {
+				throw new Exception("Invalid uebkey!");
+			}
+			if (app.size() != 0 && !app.isEmpty()) {
+				application = app.get(0);
+			}
+			if (application != null) {
+				final String appUsername = application.getUsername();
+				final String dbDecryptedPwd = CipherUtil.decryptPKC(application.getAppPassword());
+				if (appUsername.equals(accountNamePassword[0]) && dbDecryptedPwd.equals(accountNamePassword[1])) {
+					return true;
+				}
+			}
+		}
+
+		
 		BasicAuthCredentials creds;
 		try {
 			creds = basicAuthService.getBasicAuthCredentialByUsernameAndPassword(accountNamePassword[0],