You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by jo...@apache.org on 2026/09/22 10:30:16 UTC
(sling-org-apache-sling-engine) branch SLING-13359 created (now a804358)
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a change to branch SLING-13359
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
at a804358 SLING-13359 getRequestedSessionId should return the session ID presented by the client
This branch includes the following new commits:
new a804358 SLING-13359 getRequestedSessionId should return the session ID presented by the client
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(sling-org-apache-sling-engine) 01/01: SLING-13359 getRequestedSessionId should return the session ID presented by the client
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch SLING-13359
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
commit a8043583017967e819bc36af1047be8e42d66b00
Author: Joerg Hoh <jo...@apache.org>
AuthorDate: Tue Sep 22 12:29:15 2026 +0200
SLING-13359 getRequestedSessionId should return the session ID presented by the client
---
.../impl/adapter/SlingServletRequestAdapter.java | 3 +-
.../adapter/SlingServletRequestAdapterTest.java | 94 ++++++++++++++++++++++
2 files changed, 95 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java b/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
index 1f3a52c..6f85e3a 100644
--- a/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
+++ b/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
@@ -150,8 +150,7 @@ public class SlingServletRequestAdapter extends SlingJakartaHttpServletRequestWr
@Override
public String getRequestedSessionId() {
- final HttpSession session = request.getSession(false);
- return session != null ? session.getId() : null;
+ return request.getRequestedSessionId();
}
@Override
diff --git a/src/test/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapterTest.java b/src/test/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapterTest.java
new file mode 100644
index 0000000..062f350
--- /dev/null
+++ b/src/test/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapterTest.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.engine.impl.adapter;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class SlingServletRequestAdapterTest {
+
+ @Test
+ public void testGetRequestedSessionIdReturnsClientPresentedId() {
+ final SlingJakartaHttpServletRequest slingRequest = Mockito.mock(SlingJakartaHttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpSession session = Mockito.mock(HttpSession.class);
+ Mockito.when(session.getId()).thenReturn("live-server-session-id");
+ Mockito.when(request.getSession(false)).thenReturn(session);
+ Mockito.when(request.getRequestedSessionId()).thenReturn("client-presented-id");
+
+ final SlingServletRequestAdapter adapter = new SlingServletRequestAdapter(slingRequest, request);
+
+ // the servlet spec defines getRequestedSessionId() as the id sent by
+ // the client - it must never be answered with the live session id
+ assertEquals("client-presented-id", adapter.getRequestedSessionId());
+ verify(request, times(1)).getRequestedSessionId();
+ // regression guard: the live session must never be consulted for this
+ // call, otherwise the fix could silently regress to leaking the live
+ // session id again
+ verify(request, never()).getSession(anyBoolean());
+ verify(session, never()).getId();
+ }
+
+ @Test
+ public void testGetRequestedSessionIdNullWhenClientSentNone() {
+ final SlingJakartaHttpServletRequest slingRequest = Mockito.mock(SlingJakartaHttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpSession session = Mockito.mock(HttpSession.class);
+ Mockito.when(session.getId()).thenReturn("live-server-session-id");
+ Mockito.when(request.getSession(false)).thenReturn(session);
+ Mockito.when(request.getRequestedSessionId()).thenReturn(null);
+
+ final SlingServletRequestAdapter adapter = new SlingServletRequestAdapter(slingRequest, request);
+
+ // even with a live session, a request without a client session id
+ // must report null (e.g. for session fixation detection)
+ assertNull(adapter.getRequestedSessionId());
+ verify(request, times(1)).getRequestedSessionId();
+ // regression guard: must not fall back to the live session id when
+ // the client did not present one
+ verify(request, never()).getSession(anyBoolean());
+ verify(session, never()).getId();
+ }
+
+ @Test
+ public void testGetRequestedSessionIdReturnsClientPresentedIdWithoutLiveSession() {
+ final SlingJakartaHttpServletRequest slingRequest = Mockito.mock(SlingJakartaHttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ // no live session exists (e.g. it expired or was never created),
+ // yet the client still presented a (now stale/invalid) session id
+ Mockito.when(request.getSession(false)).thenReturn(null);
+ Mockito.when(request.getRequestedSessionId()).thenReturn("stale-client-id");
+
+ final SlingServletRequestAdapter adapter = new SlingServletRequestAdapter(slingRequest, request);
+
+ assertEquals("stale-client-id", adapter.getRequestedSessionId());
+ verify(request, times(1)).getRequestedSessionId();
+ verify(request, never()).getSession(anyBoolean());
+ }
+}