backport: Set clusterKey cookie at first request (#143) (#150)

vaadin · Oct 30, 2024 · 58e743d · 58e743d
1 parent 4805978
commit 58e743d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/...rter/src/main/java/com/vaadin/kubernetes/starter/sessiontracker/SessionTrackerCookie.java b/...rter/src/main/java/com/vaadin/kubernetes/starter/sessiontracker/SessionTrackerCookie.java
@@ -41,15 +41,17 @@ private SessionTrackerCookie() {
     public static void setIfNeeded(HttpSession session,
             HttpServletRequest request, HttpServletResponse response) {
         Optional<Cookie> clusterKeyCookie = getCookie(request);
-        if (!clusterKeyCookie.isPresent()) {
+        if (clusterKeyCookie.isEmpty()) {
             String clusterKey = UUID.randomUUID().toString();
-            session.setAttribute(CurrentKey.COOKIE_NAME, clusterKey);
+            if (session != null) {
+                session.setAttribute(CurrentKey.COOKIE_NAME, clusterKey);
+            }
             response.addCookie(new Cookie(CurrentKey.COOKIE_NAME, clusterKey));
-        } else if (session.getAttribute(CurrentKey.COOKIE_NAME) == null) {
+        } else if (session != null
+                && session.getAttribute(CurrentKey.COOKIE_NAME) == null) {
             String clusterKey = clusterKeyCookie.get().getValue();
             session.setAttribute(CurrentKey.COOKIE_NAME, clusterKey);
         }
-
     }
 
     /**

diff --git a/...rter/src/main/java/com/vaadin/kubernetes/starter/sessiontracker/SessionTrackerFilter.java b/...rter/src/main/java/com/vaadin/kubernetes/starter/sessiontracker/SessionTrackerFilter.java
@@ -66,9 +66,7 @@ protected void doFilter(HttpServletRequest request,
         try {
             HttpSession session = request.getSession(false);
 
-            if (session != null) {
-                SessionTrackerCookie.setIfNeeded(session, request, response);
-            }
+            SessionTrackerCookie.setIfNeeded(session, request, response);
             super.doFilter(request, response, chain);
 
             if (session != null && request.isRequestedSessionIdValid()

diff --git a/.../src/test/java/com/vaadin/kubernetes/starter/sessiontracker/SessionTrackerCookieTest.java b/.../src/test/java/com/vaadin/kubernetes/starter/sessiontracker/SessionTrackerCookieTest.java
@@ -126,4 +126,15 @@ void getValue_valueIsReturned() {
         assertTrue(value.isPresent());
         assertEquals(clusterKey, value.get());
     }
+
+    @Test
+    void setIfNeeded_nullCookiesAndSession_cookieIsConfigured() {
+        HttpServletRequest request = mock(HttpServletRequest.class);
+        when(request.getCookies()).thenReturn(null);
+        HttpServletResponse response = mock(HttpServletResponse.class);
+
+        SessionTrackerCookie.setIfNeeded(null, request, response);
+
+        verify(response).addCookie(any());
+    }
 }