go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-06-23 00:40:46 +02:00
Code Issues Releases Activity

Move validateSession back into refreshSessionIfNeeded

Browse Source
This commit is contained in:
Kevin Kreitner
2021-10-11 16:50:26 +02:00
committed by Joel Speed
parent ad8ce2f6a4
commit d9e0933e54
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/middleware/stored_session.go
View File

@ -103,13 +103,7 @@ func (s *storedSessionLoader) getValidatedSession(rw http.ResponseWriter, req *h
err = s.refreshSessionIfNeeded(rw, req, session)
if err != nil {
logger.Errorf("error refreshing access token for session (%s): %v", session, err)
}
// Validate all sessions after any Redeem/Refresh operation (fail or success)
err = s.validateSession(req.Context(), session)
if err != nil {
return nil, err
return nil, fmt.Errorf("error refreshing access token for session (%s): %v", session, err)
}
return session, nil
@ -133,11 +127,22 @@ func (s *storedSessionLoader) refreshSessionIfNeeded(rw http.ResponseWriter, req
// it should be updated after lock is released.
if wasLocked {
logger.Printf("Update session from store instead of refreshing")
return s.updateSessionFromStore(req, session)
err = s.updateSessionFromStore(req, session)
if err != nil {
logger.Errorf("Unable to update session from store: %v", err)
}
} else {
logger.Printf("Refreshing session - User: %s; SessionAge: %s", session.User, session.Age())
err = s.refreshSession(rw, req, session)
if err != nil {
// If a preemptive refresh fails, we still keep the session
// if validateSession succeeds.
logger.Errorf("Unable to refresh session: %v", err)
}
}
logger.Printf("Refreshing session - User: %s; SessionAge: %s", session.User, session.Age())
return s.refreshSession(rw, req, session)
// Validate all sessions after any Redeem/Refresh operation (fail or success)
return s.validateSession(req.Context(), session)
}
// refreshSession attempts to refresh the session with the provider