Skip to content

outpost/proxyv2: revalidate auth if session fails to load (cherry-pick #18063 to version-2025.12) #20059

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
BeryJu merged 2 commits into from
Feb 5, 2026
+36 −2
Merged

outpost/proxyv2: revalidate auth if session fails to load (cherry-pick #18063 to version-2025.12) #20059

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba52cf
outpost/proxyv2: revalidate auth if session fails to load (#18063)
chetan Feb 5, 2026
8f31b20
Merge branch 'version-2025.12' into cherry-pick/18063-to-version-2025.12
dewi-tik Feb 5, 2026
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
38 changes: 36 additions & 2 deletions internal/outpost/proxyv2/application/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package application

import (
"context"
"net/http"
"net/url"
"strings"
Expand All @@ -19,8 +20,41 @@ func (a *Application) handleAuthStart(rw http.ResponseWriter, r *http.Request, f
state, err := a.createState(r, rw, fwd)
if err != nil {
a.log.WithError(err).Warning("failed to create state")
rw.WriteHeader(400)
return
if !strings.HasPrefix(err.Error(), "failed to get session") {
rw.WriteHeader(400)
return
}

// Client has a cookie but we're unable to load the session from
// storage (TMPDIR=/dev/shm). This can happen if the session file
// was deleted due to container restart or session invalidation
// (e.g., logout on auth server).
//
// Re-save an empty session and try again.

session, err := a.sessions.Get(r, a.SessionName())
if err != nil && !strings.HasSuffix(err.Error(), "no such file or directory") {
a.log.WithError(err).Warning("failed to get session")
rw.WriteHeader(400)
return
}
err = a.sessions.Save(r, rw, session)
if err != nil {
a.log.WithError(err).Warning("failed to save session")
rw.WriteHeader(400)
return
}

// The registry caches the previous attempt to open the session so it
// needs to be cleared in order to get the session in createState().
*r = *r.WithContext(context.Background())

state, err = a.createState(r, rw, fwd)
if err != nil {
a.log.WithError(err).Warning("failed to create state on retry")
rw.WriteHeader(400)
return
}
}
http.Redirect(rw, r, a.oauthConfig.AuthCodeURL(state), http.StatusFound)
}
Expand Down
Loading