Skip to content

oidc: handle session invalidation errors #1239

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 1 commit into from
Oct 31, 2025
+12 −3
Merged

oidc: handle session invalidation errors #1239

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
15 changes: 12 additions & 3 deletions ...ns/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcCallbackFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;

public class OidcCallbackFilter implements Filter {
Expand Down Expand Up @@ -87,7 +88,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha

if (code == null || state == null || !state.equals(expectedState)) {
log.warn("Invalid callback parameters: code={}, state={}, expectedState={}", code != null, state, expectedState);
session.invalidate();
invalidateOrWarn(session);
resp.sendRedirect(resp.encodeRedirectURL(OidcAuthFilter.URL + "?from=" + postLoginUrl));
return;
}
Expand All @@ -103,9 +104,17 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
resp.sendRedirect(resp.encodeRedirectURL(postLoginUrl));

} catch (Exception e) {
log.warn("OIDC callback error: {}", e.getMessage());
session.invalidate();
log.warn("OIDC callback error", e);
invalidateOrWarn(session);
resp.sendRedirect(resp.encodeRedirectURL(OidcAuthFilter.URL + "?from=" + postLoginUrl));
}
}

private static void invalidateOrWarn(HttpSession session) {
try {
session.invalidate();
} catch (Exception e) {
log.warn("Unable to invalidate the session", e);
}
}
}