Session manager only manages logged-in user sessions.

Author: snoopdave

app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSessionManager.java renamed to app/src/main/java/org/apache/roller/weblogger/ui/core/RollerLoginSessionManager.java

@@ -10,17 +10,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class RollerSessionManager {
-   private static final Log log = LogFactory.getLog(RollerSessionManager.class);
+public class RollerLoginSessionManager {
+   private static final Log log = LogFactory.getLog(RollerLoginSessionManager.class);
    private static final String CACHE_ID = "roller.session.cache";
    private final Cache sessionCache;
 
-   public static RollerSessionManager getInstance() {
-      return RollerSessionManager.SingletonHolder.INSTANCE;
+   public static RollerLoginSessionManager getInstance() {
+      return RollerLoginSessionManager.SingletonHolder.INSTANCE;
    }
 
    private static class SingletonHolder {
-      private static final RollerSessionManager INSTANCE = new RollerSessionManager();
+      private static final RollerLoginSessionManager INSTANCE = new RollerLoginSessionManager();
    }
 
    class SessionCacheHandler extends CacheHandlerAdapter {
@@ -33,12 +33,12 @@ public void invalidate(User user) {
    }
 
    /** Testing purpose only */
-   RollerSessionManager(Cache cache) {
+   RollerLoginSessionManager(Cache cache) {
       this.sessionCache = cache;
       CacheManager.registerHandler(new SessionCacheHandler());
    }
 
-   private RollerSessionManager() {
+   private RollerLoginSessionManager() {
       Map<String, String> cacheProps = new HashMap<>();
       cacheProps.put("id", CACHE_ID);
       cacheProps.put("size", "1000");  // Cache up to 1000 sessions

app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java

@@ -71,7 +71,7 @@ public static RollerSession getRollerSession(HttpServletRequest request) {
                 session.setAttribute(ROLLER_SESSION, rollerSession);
             } else if (rollerSession.getAuthenticatedUser() != null) {
                 // Check if session is still valid in cache
-                RollerSessionManager manager = RollerSessionManager.getInstance();
+                RollerLoginSessionManager manager = RollerLoginSessionManager.getInstance();
                 String username = rollerSession.getAuthenticatedUser().getUserName();
                 if (manager.get(username) == null) {
                     rollerSession = new RollerSession();
@@ -174,7 +174,7 @@ public User getAuthenticatedUser() {
      */
     public void setAuthenticatedUser(User authenticatedUser) {
         this.userName = authenticatedUser.getUserName();
-        RollerSessionManager sessionManager = RollerSessionManager.getInstance();
+        RollerLoginSessionManager sessionManager = RollerLoginSessionManager.getInstance();
         sessionManager.register(authenticatedUser.getUserName(), this);
     }
 

app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java

@@ -37,7 +37,7 @@
 import org.apache.roller.weblogger.pojos.GlobalPermission;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
-import org.apache.roller.weblogger.ui.core.RollerSessionManager;
+import org.apache.roller.weblogger.ui.core.RollerLoginSessionManager;
 import org.apache.roller.weblogger.ui.struts2.core.Register;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -169,14 +169,14 @@ public String save() {
 
                 // invalidate user's session if it's not user executing this action
                 if (!getAuthenticatedUser().getUserName().equals(user.getUserName())) {
-                    RollerSessionManager sessionManager = RollerSessionManager.getInstance();
+                    RollerLoginSessionManager sessionManager = RollerLoginSessionManager.getInstance();
                     sessionManager.invalidate(user.getUserName());
                 }
             }
 
             // if user is disabled and not the same as the user executing this action, then invalidate their session
            if (!user.getEnabled() && !getAuthenticatedUser().getUserName().equals(user.getUserName())) {
-                RollerSessionManager sessionManager = RollerSessionManager.getInstance();
+                RollerLoginSessionManager sessionManager = RollerLoginSessionManager.getInstance();
                 sessionManager.invalidate(user.getUserName());
             }
 

app/src/test/java/org/apache/roller/weblogger/ui/core/RollerSessionManagerTest.java renamed to app/src/test/java/org/apache/roller/weblogger/ui/core/RollerLoginSessionManagerTest.java

@@ -28,14 +28,14 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-class RollerSessionManagerTest {
-    private RollerSessionManager sessionManager;
+class RollerLoginSessionManagerTest {
+    private RollerLoginSessionManager sessionManager;
     private Cache mockCache;
 
     @BeforeEach
     void setUp() {
         mockCache = mock(Cache.class);
-        sessionManager = new RollerSessionManager(mockCache);
+        sessionManager = new RollerLoginSessionManager(mockCache);
     }
 
     @Test