From f9677b1fe8e49be038b49fd79b268128232a971b Mon Sep 17 00:00:00 2001 From: a Date: Fri, 20 Sep 2024 13:35:37 +0100 Subject: [PATCH] a Signed-off-by: a --- .../security/UserAuthenticationFilter.java | 22 +++++++++---------- .../session/CustomHttpSessionListener.java | 9 ++++---- .../session/SessionPersistentRegistry.java | 12 +++++----- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java index 68e4cc1c5..7b5bb47a8 100644 --- a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java +++ b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java @@ -56,17 +56,17 @@ public class UserAuthenticationFilter extends OncePerRequestFilter { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); // Check for session expiration (unsure if needed) -// if (authentication != null && authentication.isAuthenticated()) { -// String sessionId = request.getSession().getId(); -// SessionInformation sessionInfo = -// sessionPersistentRegistry.getSessionInformation(sessionId); -// -// if (sessionInfo != null && sessionInfo.isExpired()) { -// SecurityContextHolder.clearContext(); -// response.sendRedirect(request.getContextPath() + "/login?expired=true"); -// return; -// } -// } + // if (authentication != null && authentication.isAuthenticated()) { + // String sessionId = request.getSession().getId(); + // SessionInformation sessionInfo = + // sessionPersistentRegistry.getSessionInformation(sessionId); + // + // if (sessionInfo != null && sessionInfo.isExpired()) { + // SecurityContextHolder.clearContext(); + // response.sendRedirect(request.getContextPath() + "/login?expired=true"); + // return; + // } + // } // Check for API key in the request headers if no authentication exists if (authentication == null || !authentication.isAuthenticated()) { diff --git a/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java b/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java index a6a9b5883..5039fa837 100644 --- a/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java +++ b/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java @@ -26,11 +26,10 @@ public class CustomHttpSessionListener implements HttpSessionListener { @Override public void sessionCreated(HttpSessionEvent se) { - log.info( - "Session created: {} with count {}", - se.getSession().getId(), - activeSessions.incrementAndGet()); - + log.info( + "Session created: {} with count {}", + se.getSession().getId(), + activeSessions.incrementAndGet()); } @Override diff --git a/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java b/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java index 615a2827f..f7f78d1e1 100644 --- a/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java +++ b/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java @@ -85,12 +85,12 @@ public class SessionPersistentRegistry implements SessionRegistry { if (principalName != null) { // Clear old sessions for the principal (unsure if needed) -// List existingSessions = -// sessionRepository.findByPrincipalName(principalName); -// for (SessionEntity session : existingSessions) { -// session.setExpired(true); -// sessionRepository.save(session); -// } + // List existingSessions = + // sessionRepository.findByPrincipalName(principalName); + // for (SessionEntity session : existingSessions) { + // session.setExpired(true); + // sessionRepository.save(session); + // } SessionEntity sessionEntity = new SessionEntity(); sessionEntity.setSessionId(sessionId);