Skip to content

fix: delete the cookie when the session is invalid #5132

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
g-linville merged 2 commits into from
Nov 25, 2025
Merged

fix: delete the cookie when the session is invalid #5132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05635ff
fix: delete the cookie when the session is invalid
g-linville Nov 24, 2025
197c020
tweak
g-linville Nov 24, 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
21 changes: 12 additions & 9 deletions pkg/api/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,6 @@ func (s *Server) Wrap(f api.HandlerFunc) http.HandlerFunc {

user, err := s.authenticator.Authenticate(req)
if err != nil {
// Check if this is a FetchUserGroupsError which indicates an auth provider configuration issue
var fetchGroupsErr *gclient.FetchUserGroupsError
if errors.As(err, &fetchGroupsErr) {
http.Error(rw, fmt.Sprintf("Authentication provider configuration error: %s. Please contact an administrator to fix the auth provider configuration.", err.Error()), http.StatusInternalServerError)
return
}

http.Error(rw, err.Error(), http.StatusUnauthorized)

if errors.Is(err, proxy.ErrInvalidSession) {
// The session is invalid, so tell the browser to delete the cookie so that it won't try it again.
http.SetCookie(rw, &http.Cookie{
Expand All @@ -101,7 +92,19 @@ func (s *Server) Wrap(f api.HandlerFunc) http.HandlerFunc {
Path: "/",
MaxAge: -1,
})
// Refresh the page so that the cookie deletes.
http.Redirect(rw, req, req.URL.String(), http.StatusFound)
Copy link
Member Author

@g-linville g-linville Nov 24, 2025

Choose a reason for hiding this comment

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

This feels like an abuse of HTTP but I'm not sure of any other way to delete the cookie and refresh, besides doing this.

return
}

http.Error(rw, err.Error(), http.StatusUnauthorized)

// Check if this is a FetchUserGroupsError which indicates an auth provider configuration issue
var fetchGroupsErr *gclient.FetchUserGroupsError
if errors.As(err, &fetchGroupsErr) {
http.Error(rw, fmt.Sprintf("Authentication provider configuration error: %s. Please contact an administrator to fix the auth provider configuration.", err.Error()), http.StatusInternalServerError)
}

return
}

Expand Down
Loading