Skip to content

Add null-check for client before coordinating session lifecycle #2038

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

Merged
merged 2 commits into from
Jun 4, 2025
Merged

Add null-check for client before coordinating session lifecycle #2038

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c908d15
Add null-check for client before coordinating session lifecycle
khalidabuhakmeh Jun 4, 2025
4635183
Add unit test to verify handling of missing client in session coordin…
khalidabuhakmeh Jun 4, 2025
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
17 changes: 10 additions & 7 deletions identity-server/src/IdentityServer/Services/Default/DefaultSessionCoordinationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,17 @@ public virtual async Task ProcessExpirationAsync(UserSession session)
{
var client = await ClientStore.FindClientByIdAsync(clientId); // i don't think we care if it's an enabled client at this point

var shouldCoordinate =
client.CoordinateLifetimeWithUserSession == true ||
(Options.Authentication.CoordinateClientLifetimesWithUserSession && client.CoordinateLifetimeWithUserSession != false);

if (shouldCoordinate)
if (client != null)
{
// this implies they should also be contacted for backchannel logout below
clientsToCoordinate.Add(clientId);
var shouldCoordinate =
client.CoordinateLifetimeWithUserSession == true ||
(Options.Authentication.CoordinateClientLifetimesWithUserSession && client.CoordinateLifetimeWithUserSession != false);

if (shouldCoordinate)
{
// this implies they should also be contacted for backchannel logout below
clientsToCoordinate.Add(clientId);
}
}
}

Expand Down