mirror of
https://github.com/oauth2-proxy/oauth2-proxy.git
synced 2025-06-10 23:57:44 +02:00
Add more specific error when updating from store
This commit is contained in:
parent
c6d8cd1ea4
commit
ccd7a91b2b
@ -132,11 +132,8 @@ func (s *storedSessionLoader) refreshSessionIfNeeded(rw http.ResponseWriter, req
|
|||||||
// If session was locked, fetch current state, because
|
// If session was locked, fetch current state, because
|
||||||
// it should be updated after lock is released.
|
// it should be updated after lock is released.
|
||||||
if wasLocked {
|
if wasLocked {
|
||||||
err = s.updateSessionFromStore(req, session)
|
logger.Printf("update session from store")
|
||||||
if err != nil {
|
return s.updateSessionFromStore(req, session)
|
||||||
logger.Errorf("Unable to load updated session from store: %v", err)
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Printf("Refreshing session - User: %s; SessionAge: %s", session.User, session.Age())
|
logger.Printf("Refreshing session - User: %s; SessionAge: %s", session.User, session.Age())
|
||||||
@ -200,11 +197,11 @@ func (s *storedSessionLoader) refreshSession(rw http.ResponseWriter, req *http.R
|
|||||||
func (s *storedSessionLoader) updateSessionFromStore(req *http.Request, session *sessionsapi.SessionState) error {
|
func (s *storedSessionLoader) updateSessionFromStore(req *http.Request, session *sessionsapi.SessionState) error {
|
||||||
sessionStored, err := s.store.Load(req)
|
sessionStored, err := s.store.Load(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return fmt.Errorf("unable to load updated session from store: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if session == nil || sessionStored == nil {
|
if session == nil || sessionStored == nil {
|
||||||
return nil
|
return fmt.Errorf("no session available to udpate from store")
|
||||||
}
|
}
|
||||||
*session = *sessionStored
|
*session = *sessionStored
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user