9:02 p.m.
Author: mmillson
Date: 2008-10-08 22:02:07 -0400 (Wed, 08 Oct 2008)
New Revision: 12057
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2194/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
Log:
"Fix issues with last-login date feature for [JBPORTAL-2194]."
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2194/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
===================================================================
---
branches/JBoss_Portal_2_6_6_JBPORTAL-2194/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-10-08
23:22:13 UTC (rev 12056)
+++
branches/JBoss_Portal_2_6_6_JBPORTAL-2194/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-10-09
02:02:07 UTC (rev 12057)
@@ -22,10 +22,18 @@
******************************************************************************/
package org.jboss.portal.core.aspects.server;
+import java.security.Principal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
+
import org.jboss.logging.Logger;
import org.jboss.portal.common.invocation.AttributeResolver;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.core.CoreConstants;
import org.jboss.portal.identity.CachedUserImpl;
import org.jboss.portal.identity.NoSuchUserException;
import org.jboss.portal.identity.User;
@@ -122,7 +130,6 @@
{
boolean trace = log.isTraceEnabled();
HttpServletRequest req = invocation.getServerContext().getClientRequest();
- HttpSession httpSession = req.getSession();
// Get scope
AttributeResolver principalScopeResolver =
invocation.getContext().getAttributeResolver(ServerInvocation.PRINCIPAL_SCOPE);
@@ -132,7 +139,7 @@
// The user and its profile
User user = null;
- Map profile = null;
+ Map<String, String> profile = null;
// Fetch user if we can
if (userPrincipal != null)
@@ -156,6 +163,9 @@
// Fetch user info
user = getUserModule().findUserByUserName(userName);
+ // Set Last login date
+ getUserProfileModule().setProperty(user, User.INFO_USER_LAST_LOGIN_DATE,
"" + new Date());
+
// Get profile
profile = getUserProfileModule().getProperties(user);
@@ -170,6 +180,8 @@
// Cache
invocation.getContext().setAttribute(ServerInvocation.PRINCIPAL_SCOPE,
PROFILE_KEY, profile);
+
+
}
//
@@ -192,54 +204,6 @@
}
}
- //
- if (user == null)
- {
- // Erase any previous user finalizer, the side effect of unbinding the session
attribute will finalize the previous user
- UserFinalizer finalizer =
(UserFinalizer)httpSession.getAttribute(CoreConstants.Servlet.Session.USER_FINALIZER);
- if (finalizer != null)
- {
- if (trace)
- {
- log.trace("Removing finalizer for user=" + finalizer.userId);
- }
- httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER,
null);
- }
- }
- else
- {
- // Get the current finalizer if any
- UserFinalizer finalizer =
(UserFinalizer)httpSession.getAttribute(CoreConstants.Servlet.Session.USER_FINALIZER);
-
- // Get the user id from the request user
- if (finalizer == null)
- {
- if (trace)
- {
- log.trace("Adding finalizer for user=" + user.getUserName());
- }
-
- // Set the user finalizer
- finalizer = new UserFinalizer(user.getId());
-
- // Bind the new one, the side effect finalizes the previous user
- httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER,
finalizer);
- }
- else if (!finalizer.userId.equals(user.getId()))
- {
- if (trace)
- {
- log.trace("Replacing the finalizer for user=" + finalizer.userId
+ " with user=" + user.getId());
- }
-
- // Set the user finalizer
- finalizer = new UserFinalizer(user.getId());
-
- // Bind the new one, the side effect finalizes the previous user
- httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER,
finalizer);
- }
- }
-
try
{
// Continue the invocation
@@ -255,7 +219,6 @@
}
}
-
public boolean isCacheUser()
{
return cacheUser;
@@ -266,117 +229,4 @@
this.cacheUser = cacheUser;
}
- /** Implement the last login date feature. */
- private static class UserFinalizer implements Serializable,
HttpSessionBindingListener
- {
-
- /** The serialVersionUID */
- private static final long serialVersionUID = -8534276945533635226L;
-
- private static final Logger log = Logger.getLogger(UserFinalizer.class);
-
- private final Object userId;
-
- public UserFinalizer(Object userId)
- {
- if (userId == null)
- {
- throw new IllegalArgumentException("No user id present");
- }
- this.userId = userId;
- }
-
- public void valueBound(HttpSessionBindingEvent event)
- {
- }
-
- public void valueUnbound(HttpSessionBindingEvent event)
- {
- try
- {
- finalizeUser();
- }
- catch (Exception e)
- {
- log.warn("Cannot set last login date for user with id '" +
userId + "' : " + e.getMessage());
- log.debug("Failed to set user last login date (may happen during server
shutdown): ", e);
- }
- }
-
- protected void finalizeUser() throws Exception
- {
- /**
- * Note: Due to a possible bug in JBoss Cache Transaction propagation within a
cluster,
- * We need to spawn a separate thread with its own new transaction to perform
the finalizeUser
- * logic.
- *
- * Without that, it results in data deadlocks in the cluster.
- */
- Thread thread = new Thread(new FinalizeRunner());
- thread.start();
- thread.join();
- }
-
- /**
- *
- * @author soshah
- *
- */
- private class FinalizeRunner implements Runnable
- {
- public void run()
- {
- UserTransaction tx = null;
- try
- {
- //
- if (log.isTraceEnabled())
- {
- log.trace("Finalizing user " + userId);
- }
-
- //
- // Here we use JNDI to locate the module as this finalizer could have
been
- // migrated in the session of another node of the cluster
- UserModule userModule = null;
- UserProfileModule userProfileModule = null;
- InitialContext ctx = new InitialContext();
- tx = (UserTransaction)ctx.lookup("UserTransaction");
- tx.begin();
- try
- {
- userModule = (UserModule)new
InitialContext().lookup("java:portal/UserModule");
- userProfileModule = (UserProfileModule)new
InitialContext().lookup("java:portal/UserProfileModule");
- }
- catch (NameNotFoundException ignore)
- {
- // Name is not bound anymore, it could happen during a shutdown, we
don't do anything
- }
-
- // Get user and set last visit date to now if we can
- if (userModule != null && userProfileModule != null)
- {
- try
- {
- User user = userModule.findUserById(userId);
- //user.setLastVisitDate(new Date());
- userProfileModule.setProperty(user, User.INFO_USER_LAST_LOGIN_DATE,
new Date().toString());
-
- }
- catch (NoSuchUserException e)
- {
- // User is not found
- log.warn("Trying to finalize non existing user " +
userId);
- }
- }
- tx.commit();
- }
- catch(Exception e)
- {
- try{tx.rollback();}catch(Exception rbe){}
- log.debug(this, e);
- }
- }
- }
- }
}