Changeset 7900

Timestamp:

Jan 21, 2021, 8:18:54 AM (2 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2238: Mark sessions without a logout time as inactive when BASE is starting

Location:

trunk/src/core/net/sf/basedb/core

Files:

• Application.java (modified) (1 diff)
• Session.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/Application.java

@@ -564 +564 @@
         // BouncyCastle
         if (Security.getProvider("BC") == null) Security.addProvider(new BouncyCastleProvider());
+        
+        // Auto-logout existing session without logout time
+        if (options.autoLogoutSessions) 
+        {
+          int numSessions = Session.autoLogout();
+          log.info(numSessions + " sessions without a logout time was automatically logged out.");
+        }
         
         // Initialize extensions system 

trunk/src/core/net/sf/basedb/core/Session.java

@@ -24 +24 @@
 
 import net.sf.basedb.core.data.SessionData;
+import net.sf.basedb.core.hibernate.TypeWrapper;
 import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.core.query.Hql;
@@ -98 +99 @@
     return query;
   }
+  
+  /**
+    Cleanup method that sets a logout-time on all sessions 
+    that doesn't have a logout time.
+    @return The number of sessions updated
+    @since 3.18
+  */
+  static int autoLogout()
+  {
+    org.hibernate.Transaction tx = null;
+    org.hibernate.Session session = null;
+    int numUpdated = 0;
+    try
+    {
+      session = HibernateUtil.newSession();
+      tx = HibernateUtil.newTransaction(session);
+      
+      // Update 'location'
+      org.hibernate.query.Query<?> query = HibernateUtil.createQuery(session, 
+        "UPDATE SessionData s " + 
+        "SET s.logoutTime = :now " +
+        "WHERE s.logoutTime IS NULL");
+      query.setParameter("now", new Date(), TypeWrapper.H_TIMESTAMP);
+      numUpdated = query.executeUpdate();
+      HibernateUtil.commit(tx);
+    }
+    catch (Exception ex)
+    {
+      // This should now be a fatal error, log a warning only
+      Application.getLogger().warn("Could not auto-logout existing sessions", ex);
+    }
+    finally
+    {
+      HibernateUtil.close(session);
+    }
+    return numUpdated;
+  }
 
   Session(SessionData sessionData)