fix ISE in ServletSessionStore

pac4j · Aug 11, 2023 · c0b55af · c0b55af
1 parent 2056628
commit c0b55af
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,10 +7,10 @@ env:
 on:
   push:
     branches:
-      - master
+      - 5.0.x
   pull_request:
     branches:
-      - master
+      - 5.0.x
 
 permissions:
   contents: read

diff --git a/core/src/main/java/org/pac4j/jax/rs/servlet/pac4j/ServletSessionStore.java b/core/src/main/java/org/pac4j/jax/rs/servlet/pac4j/ServletSessionStore.java
@@ -22,39 +22,56 @@ public class ServletSessionStore implements SessionStore {
 
     protected HttpSession httpSession;
 
-    protected ServletSessionStore() {
-    }
+    protected ServletSessionStore() {}
 
     protected ServletSessionStore(final HttpSession httpSession) {
         this.httpSession = httpSession;
     }
 
-    public HttpSession getHttpSession(WebContext context) {
+    public HttpSession getHttpSession(final WebContext context) {
         assert context instanceof ServletJaxRsContext;
-        return ((ServletJaxRsContext) context).getRequest().getSession();
+        try {
+            return ((ServletJaxRsContext) context).getRequest().getSession();
+        } catch (final IllegalStateException e) {
+            return null;
+        }
     }
 
     @Override
-    public Optional<Object> get(WebContext context, String key) {
-        return Optional.ofNullable(getHttpSession(context).getAttribute(key));
+    public Optional<Object> get(final WebContext context, final String key) {
+        final HttpSession session = getHttpSession(context);
+
+        if (session == null) {
+            return Optional.empty();
+        }
+
+        return Optional.ofNullable(session.getAttribute(key));
     }
 
     @Override
-    public void set(WebContext context, String key, Object value) {
-        if (value == null) {
-            getHttpSession(context).removeAttribute(key);
-        } else {
-            getHttpSession(context).setAttribute(key, value);
+    public void set(final WebContext context, final String key, final Object value) {
+        final HttpSession session = getHttpSession(context);
+
+        if (session != null) {
+            if (value == null) {
+                session.removeAttribute(key);
+            } else {
+                session.setAttribute(key, value);
+            }
         }
     }
 
     @Override
     public boolean destroySession(WebContext context) {
         final HttpSession session = getHttpSession(context);
 
-        session.invalidate();
+        if (session != null) {
+            session.invalidate();
+
+            return true;
+        }
 
-        return true;
+        return false;
     }
 
     @Override
@@ -65,17 +82,22 @@ public Optional<Object> getTrackableSession(WebContext context) {
     @Override
     public boolean renewSession(WebContext context) {
         final HttpSession session = getHttpSession(context);
-        final Map<String, Object> attributes = new HashMap<>();
-        Collections.list(session.getAttributeNames()).forEach(k -> attributes.put(k, session.getAttribute(k)));
 
-        session.invalidate();
+        if (session != null) {
+            final Map<String, Object> attributes = new HashMap<>();
+            Collections.list(session.getAttributeNames()).forEach(k -> attributes.put(k, session.getAttribute(k)));
 
-        // let's recreate the session from zero, the previous becomes
-        // generally unusable depending on the servlet implementation
-        final HttpSession newSession = getHttpSession(context);
-        attributes.forEach(newSession::setAttribute);
+            session.invalidate();
+
+            // let's recreate the session from zero, the previous becomes
+            // generally unusable depending on the servlet implementation
+            final HttpSession newSession = getHttpSession(context);
+            attributes.forEach(newSession::setAttribute);
+
+            return true;
+        }
 
-        return true;
+        return false;
     }
 
     @Override