Skip to content

fix: reject events for deleted in-memory sessions #1698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DisturbedCrow wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −0
Open

fix: reject events for deleted in-memory sessions #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/src/main/java/com/google/adk/sessions/InMemorySessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,13 @@ public Single<Event> appendEvent(Session session, Event event) {
String userId = session.userId();
String sessionId = session.id();

ConcurrentMap<String, ConcurrentMap<String, Session>> appSessions = sessions.get(appName);
ConcurrentMap<String, Session> userSessions =
appSessions == null ? null : appSessions.get(userId);
if (userSessions == null || !userSessions.containsKey(sessionId)) {
return Single.error(new SessionNotFoundException("Session not found: " + sessionId));

@kvmilos kvmilos Nov 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please leave the session id out of this message, e.g. just "Session not found". Session ids can come from the caller, and we keep caller-supplied values out of exception messages.

}

// --- Update User/App State (Same as before) ---
EventActions actions = event.actions();
if (actions != null) {
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/java/com/google/adk/sessions/InMemorySessionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,20 @@ public void lifecycle_deleteSession() {
.isNull();
}

@Test
public void appendEvent_rejectsDeletedSession() {

@kvmilos kvmilos Nov 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also cover a user who still has another session. Deleting the only session removes the whole app entry, so this test never reaches the containsKey check.

InMemorySessionService sessionService = new InMemorySessionService();
Session session =
sessionService.createSession("app", "user", new HashMap<>(), "session1").blockingGet();
sessionService.deleteSession("app", "user", "session1").blockingAwait();

sessionService
.appendEvent(session, Event.builder().build())

@kvmilos kvmilos Nov 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider giving this event an app-scoped state delta (State.APP_PREFIX + "key") and checking another session doesn't see it. That covers the "check before mutating state" part of the fix.

.test()
.assertError(SessionNotFoundException.class);
assertThat(sessionService.listSessions("app", "user").blockingGet().sessions()).isEmpty();
}

@Test
public void appendEvent_updatesSessionState() {
InMemorySessionService sessionService = new InMemorySessionService();
Expand Down
Loading