First pass to clean up config and fix multi serivce instance bug

[java-idp.git] / src / edu / internet2 / middleware / shibboleth / idp / session / IdPSessionFilter.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java b/src/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java
index f380851..e1a6a88 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java
@@ -63,6 +63,7 @@ public class IdPSessionFilter implements Filter {
         if (idpSessionCookie != null) {
             idpSession = sessionManager.getSession(idpSessionCookie.getValue());
             if (idpSession != null) {
+                log.trace("Updating IdP session activity time and adding session object to the request");
                 idpSession.setLastActivityInstant(new DateTime());
                 httpRequest.setAttribute(Session.HTTP_SESSION_BINDING_ATTRIBUTE, idpSession);
             }
@@ -73,7 +74,12 @@ public class IdPSessionFilter implements Filter {
 
     /** {@inheritDoc} */
     public void init(FilterConfig filterConfig) throws ServletException {
-        sessionManager = (SessionManager<Session>) filterConfig.getServletContext().getAttribute("sessionManager");
+        String sessionManagerId = filterConfig.getInitParameter("sessionManagedId");
+        if (DatatypeHelper.isEmpty(sessionManagerId)) {
+            sessionManagerId = "shibboleth.SessionManager";
+        }
+
+        sessionManager = (SessionManager<Session>) filterConfig.getServletContext().getAttribute(sessionManagerId);
     }
 
     /**
@@ -84,21 +90,19 @@ public class IdPSessionFilter implements Filter {
      * @return the user's current IdP session cookie, if they have a current session, otherwise null
      */
     protected Cookie getIdPSessionCookie(HttpServletRequest request) {
-        log.debug("Attempting to retrieve IdP session cookie.");
+        log.trace("Attempting to retrieve IdP session cookie.");
         Cookie[] requestCookies = request.getCookies();
 
         if (requestCookies != null) {
             for (Cookie requestCookie : requestCookies) {
-                if (DatatypeHelper.safeEquals(requestCookie.getDomain(), request.getLocalName())
-                        && DatatypeHelper.safeEquals(requestCookie.getPath(), request.getContextPath())
-                        && DatatypeHelper.safeEquals(requestCookie.getName(), AuthenticationEngine.IDP_SESSION_COOKIE_NAME)) {
-                    log.debug("Found IdP session cookie.");
+                if (DatatypeHelper.safeEquals(requestCookie.getName(), AuthenticationEngine.IDP_SESSION_COOKIE_NAME)) {
+                    log.trace("Found IdP session cookie.");
                     return requestCookie;
                 }
             }
         }
 
-        log.debug("No IdP session cookie sent by the client.");
+        log.trace("No IdP session cookie sent by the client.");
         return null;
     }
 }
\ No newline at end of file