git.iko.soy/typeable/oauth2-proxy
on master help sign in
Move refreshing code to block acquiring cookied session
commit2f6dcf3b5f93ec3439e8e87298bb97688862ac34 authorBrian Van Klaveren <bvan@slac.stanford.edu> dateWed 5 Jun 2019, 16:08 (7 years ago) parent48dbb39
1 file changed+14−14
oauthproxy.go+14−14
oauthproxy.go+14−14
@@ -725,21 +725,21 @@ func (p *OAuthProxy) getAuthenticatedSession(rw http.ResponseWriter, req *http.R
725725 if err != nil {
726726 logger.Printf("Error loading cookied session: %s", err)
727727 }
728− if session != nil && session.Age() > p.CookieRefresh && p.CookieRefresh != time.Duration(0) {
729− logger.Printf("Refreshing %s old session cookie for %s (refresh after %s)", session.Age(), session, p.CookieRefresh)
730− saveSession = true
731− }
732− }
733728
734− if session != nil {
735− var ok bool
736− if ok, err = p.provider.RefreshSessionIfNeeded(session); err != nil {
737− logger.Printf("%s removing session. error refreshing access token %s %s", remoteAddr, err, session)
738− clearSession = true
739− session = nil
740− } else if ok {
741− saveSession = true
742− revalidated = true
729+ if session != nil {
730+ if session.Age() > p.CookieRefresh && p.CookieRefresh != time.Duration(0) {
731+ logger.Printf("Refreshing %s old session cookie for %s (refresh after %s)", session.Age(), session, p.CookieRefresh)
732+ saveSession = true
733+ }
734+
735+ if ok, err := p.provider.RefreshSessionIfNeeded(session); err != nil {
736+ logger.Printf("%s removing session. error refreshing access token %s %s", remoteAddr, err, session)
737+ clearSession = true
738+ session = nil
739+ } else if ok {
740+ saveSession = true
741+ revalidated = true
742+ }
743743 }
744744 }
745745