Merge "Junit for SessionMgtRegistry"

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / util / SessionCookieUtil.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java
index edb5ebb..1a347e0 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java
@@ -33,30 +33,22 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.util;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
-import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.portalsdk.core.web.support.AppUtils;
 
-public class SessionCookieUtil {
+public class SessionCookieUtil extends CommonSessionCookieUtil{
        
        //private static final String JSESSIONID = "JSESSIONID";
-       private static final String EP_SERVICE = "EPService";
        private static final String USER_ID = "UserId";
-       private static Integer cookieMaxAge = -1;
-       private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SessionCookieUtil.class);
        
        public static void preSetUp(HttpServletRequest request,
                        HttpServletResponse response) {
@@ -69,6 +61,7 @@ public class SessionCookieUtil {
                        HttpServletResponse response) {
                String jSessionId = getJessionId(request);
                Cookie cookie1 = new Cookie(EP_SERVICE, jSessionId);
+               cookie1.setSecure(true);
                cookie1.setMaxAge(cookieMaxAge);
                cookie1.setDomain(EPCommonSystemProperties.getProperty(EPCommonSystemProperties.COOKIE_DOMAIN));
                cookie1.setPath("/");
@@ -78,9 +71,10 @@ public class SessionCookieUtil {
        public static void setUpUserIdCookie(HttpServletRequest request,
                        HttpServletResponse response,String userId) throws Exception {
                logger.info("************** session cookie util set up UserId cookie begins");
-               userId = CipherUtil.encryptPKC(userId,
+               userId = CipherUtil.encrypt(userId,
                                SystemProperties.getProperty(SystemProperties.Decryption_Key));
                Cookie cookie1 = new Cookie(USER_ID, userId);
+               cookie1.setSecure(true);
                cookie1.setMaxAge(cookieMaxAge);
                cookie1.setDomain(EPCommonSystemProperties.getProperty(EPCommonSystemProperties.COOKIE_DOMAIN));
                cookie1.setPath("/");
@@ -98,49 +92,11 @@ public class SessionCookieUtil {
                                if (cookie.getName().equals(USER_ID))
                                        userIdcookie = cookie;
                if(userIdcookie!=null){
-                       userId = CipherUtil.decryptPKC(userIdcookie.getValue(),
+                       userId = CipherUtil.decrypt(userIdcookie.getValue(),
                                        SystemProperties.getProperty(SystemProperties.Decryption_Key));
                }
                
                logger.info("************** session cookie util set up EP cookie completed");
                return userId;
        }
-       
-       public static String getJessionId(HttpServletRequest request){
-               
-               return request.getSession().getId();
-               /*
-               Cookie ep = WebUtils.getCookie(request, JSESSIONID);
-               if(ep==null){
-                       return request.getSession().getId();
-               }
-               return ep.getValue();
-               */
-       }
-       
-       protected static void initateSessionMgtHandler(HttpServletRequest request) {
-               String jSessionId = getJessionId(request);
-               storeMaxInactiveTime(request);
-               PortalTimeoutHandler.sessionCreated(jSessionId, jSessionId, AppUtils.getSession(request));
-       }
-       
-       protected static void storeMaxInactiveTime(HttpServletRequest request) {
-               HttpSession session = AppUtils.getSession(request);
-               if(session.getAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME) == null)
-                       session.setAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME,session.getMaxInactiveInterval());
-       }
-       
-       public static void resetSessionMaxIdleTimeOut(HttpServletRequest request) {
-               try {
-                       HttpSession session = AppUtils.getSession(request);
-                       final Object maxIdleAttribute = session.getAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME);
-                       if(session != null && maxIdleAttribute != null) {
-                               session.setMaxInactiveInterval(Integer.parseInt(maxIdleAttribute.toString()));
-                       }
-               } catch (Exception e) {
-                       logger.error(EELFLoggerDelegate.errorLogger, "resetSessionMaxIdleTimeOut failed", e);
-               }
-               
-       }
-
 }