X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FExternalAppsRestfulController.java;h=5aea7f1c30338fe2a9470110f8d78c5d79e08240;hb=8e83c25788017acd56271a72286f7dcbc974e76d;hp=fb0c269b0f9133d306b636b430076583c6bb3245;hpb=24608a9e1450c409dc3870440d29e91cc3a26bb9;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
index fb0c269b..5aea7f1c 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -48,8 +50,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.onap.portalapp.controller.EPRestrictedRESTfulBaseController;
+import org.onap.portalapp.music.conf.MusicSession;
+import org.onap.portalapp.music.util.MusicUtil;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPRole;
+import org.onap.portalapp.portal.domain.EPServiceCookie;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.logging.aop.EPAuditLog;
 import org.onap.portalapp.portal.service.AdminRolesService;
@@ -64,8 +69,12 @@ import org.onap.portalapp.portal.transport.FunctionalMenuItem;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.portal.utils.PortalConstants;
+import org.onap.portalapp.validation.DataValidator;
+import org.onap.portalapp.validation.SecureString;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.crossapi.PortalAPIResponse;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -88,6 +97,7 @@ import io.swagger.annotations.ApiOperation;
 public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseController {
 
 	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppsRestfulController.class);
+	private final DataValidator DATA_VALIDATOR = new DataValidator();
 
 	@Autowired
 	private FunctionalMenuService functionalMenuService;
@@ -109,14 +119,21 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 	@ResponseBody
 	public PortalAPIResponse publishNotification(HttpServletRequest request,
 			@RequestBody EpNotificationItem notificationItem) throws Exception {
+
+		if(!DATA_VALIDATOR.isValid(notificationItem)){
+			PortalAPIResponse response = new PortalAPIResponse(false, "failed");
+			return response;
+		}
 		String appKey = request.getHeader("uebkey");
 		EPApp app = findEpApp(appKey);
 		List<Long> postRoleIds = new ArrayList<Long>();
-		for (Long roleId : notificationItem.getRoleIds()) {
-			EPRole role = epRoleService.getRole(app.getId(), roleId);
-			if (role != null)
-				postRoleIds.add(role.getId());
-		}
+		if (app != null) {
+        for (Long roleId : notificationItem.getRoleIds()) {
+            EPRole role = epRoleService.getRole(app.getId(), roleId);
+            if (role != null)
+                postRoleIds.add(role.getId());
+        	}
+    	}
 
 		// --- recreate the user notification object with the POrtal Role Ids
 		EpNotificationItem postItem = new EpNotificationItem();
@@ -151,10 +168,10 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 		try {
 			list = this.getDataAccessService().executeNamedQuery("getMyAppDetailsByUebKey", params, null);
 		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "getMyAppDetailsByUebKey failed", e);			
+			logger.error(EELFLoggerDelegate.errorLogger, "getMyAppDetailsByUebKey failed", e);
 		}
 			
-		return (list == null || list.size() == 0) ? null : (EPApp) list.get(0);
+		return (list == null || list.isEmpty()) ? null : (EPApp) list.get(0);
 	}
 
 	@ApiOperation(value = "Gets favorite items within the functional menu for the current user.", response = FavoritesFunctionalMenuItemJson.class, responseContainer="List")
@@ -228,4 +245,30 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 		logger.warn(EELFLoggerDelegate.errorLogger, "Handling bad request", e);
 		response.sendError(HttpStatus.BAD_REQUEST.value(), e.getMessage());
 	}
+	
+	@EPAuditLog
+	@RequestMapping(value = { "/validateCookie" }, method = RequestMethod.POST)
+	public boolean validateCookie(@RequestBody EPServiceCookie epServiceCookie, HttpServletRequest request) throws Exception {
+		Map<String,String> epServiceCookieValueMap = epServiceCookie.getValue();
+		if(epServiceCookieValueMap!=null) {
+			String multifactorauthfrontendurl = SystemProperties.getProperty("frontend_url");
+			String encryptedJSessionId = epServiceCookieValueMap.get(multifactorauthfrontendurl);
+			if(encryptedJSessionId != null) {
+				String jSessionId = CipherUtil.decryptPKC(encryptedJSessionId);
+				if(jSessionId != null) {
+					if(jSessionId.equals(request.getSession().getId())) {
+						if(MusicUtil.isMusicEnable()) { 
+							MusicSession musicSession = new MusicSession();
+							String sessionId = musicSession.getAttribute(encryptedJSessionId);
+							logger.info(EELFLoggerDelegate.errorLogger, "Music sessionid : "+sessionId);
+							return (sessionId != null); 
+						} else {
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
 }