github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-09 18:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(handler): time-to-refresh in session metadata is disabled for sso

Browse Source
This commit is contained in:
Trong Huu Nguyen
2023-02-22 10:11:39 +01:00
parent afc8fd6962
commit 9ecfdb73ef
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/handler/handler.go
View File

@@ -46,11 +46,11 @@ type Standalone struct {
}
func NewStandalone(
cfg *config.Config,
cookieOpts cookie.Options,
jwksProvider openidclient.JwksProvider,
openidConfig openidconfig.Config,
crypter crypto.Crypter,
cfg *config.Config,
cookieOpts cookie.Options,
jwksProvider openidclient.JwksProvider,
openidConfig openidconfig.Config,
crypter crypto.Crypter,
) (*Standalone, error) {
autoLogin, err := autologin.New(cfg)
if err != nil {
@@ -326,14 +326,7 @@ func (s *Standalone) Session(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Content-Type", "application/json")
if s.Config.Session.Refresh {
err = json.NewEncoder(w).Encode(sess.MetadataVerboseRefresh())
} else {
err = json.NewEncoder(w).Encode(sess.MetadataVerbose())
}
err = s.sessionWriteMetadataResponse(w, r, sess)
if err != nil {
logger.Warnf("session/info: marshalling metadata: %+v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -368,8 +361,7 @@ func (s *Standalone) SessionRefresh(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(sess.MetadataVerboseRefresh())
err = s.sessionWriteMetadataResponse(w, r, sess)
if err != nil {
logger.Warnf("session/refresh: marshalling metadata: %+v", err)
w.WriteHeader(http.StatusInternalServerError)
@@ -377,6 +369,21 @@ func (s *Standalone) SessionRefresh(w http.ResponseWriter, r *http.Request) {
}
}
func (s *Standalone) sessionWriteMetadataResponse(w http.ResponseWriter, r *http.Request, sess *session.Session) error {
w.Header().Set("Content-Type", "application/json")
if !s.Config.Session.Refresh {
return json.NewEncoder(w).Encode(sess.MetadataVerbose())
}
metadata := sess.MetadataVerboseRefresh()
if s.Config.SSO.Enabled {
metadata.Tokens.NextAutoRefreshInSeconds = int64(-1)
}
return json.NewEncoder(w).Encode(metadata)
}
func (s *Standalone) ReverseProxy(w http.ResponseWriter, r *http.Request) {
s.UpstreamProxy.Handler(s, w, r)
}