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

refactor(handler): reduce logging severity for spammy statements

Browse Source
This commit is contained in:
Trong Huu Nguyen
2022-07-21 07:49:58 +02:00
parent 595d902dcd
commit 27ea0793ba
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/handler/handler_default.go
View File

@@ -10,6 +10,7 @@ import (
// Default proxies all requests upstream.
func (h *Handler) Default(w http.ResponseWriter, r *http.Request) {
logger := logentry.LogEntry(r).WithField("request_path", r.URL.Path)
isAuthenticated := false
sessionData, err := h.getSessionFromCookie(w, r)
@@ -23,12 +24,12 @@ func (h *Handler) Default(w http.ResponseWriter, r *http.Request) {
// force new authentication if loginstatus is enabled and cookie isn't set
if h.Loginstatus.NeedsLogin(r) {
isAuthenticated = false
logentry.LogEntry(r).Info("default: loginstatus was enabled, but no matching cookie was found; state is now unauthenticated")
logger.Info("default: loginstatus was enabled, but no matching cookie was found; state is now unauthenticated")
}
}
if h.AutoLogin.NeedsLogin(r, isAuthenticated) {
logentry.LogEntry(r).Info("default: request is unauthenticated; performing auto-login...")
logger.Debug("default: auto-login is enabled; request does not match skippable path")
r.Header.Add("Referer", r.URL.String())
h.Login(w, r)

6
pkg/handler/handler_frontchannellogout.go
View File

@@ -21,7 +21,7 @@ func (h *Handler) FrontChannelLogout(w http.ResponseWriter, r *http.Request) {
logoutFrontchannel := h.Client.LogoutFrontchannel(r)
if logoutFrontchannel.MissingSidParameter() {
logger.Info("front-channel logout: sid parameter not set in request; ignoring")
logger.Debug("front-channel logout: sid parameter not set in request; ignoring")
h.DeleteSessionFallback(w, r)
w.WriteHeader(http.StatusAccepted)
return
@@ -31,7 +31,7 @@ func (h *Handler) FrontChannelLogout(w http.ResponseWriter, r *http.Request) {
sessionID := h.localSessionID(sid)
sessionData, err := h.getSession(r, sessionID)
if err != nil {
logger.Infof("front-channel logout: getting session (user might already be logged out): %+v", err)
logger.Debugf("front-channel logout: could not get session (user might already be logged out): %+v", err)
w.WriteHeader(http.StatusAccepted)
return
}
@@ -42,7 +42,7 @@ func (h *Handler) FrontChannelLogout(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusAccepted)
return
} else if sessionData != nil {
logger.WithField("jti", sessionData.IDTokenJwtID).Infof("front-channel logout: successful logout")
logger.WithField("jti", sessionData.IDTokenJwtID).Info("front-channel logout: successful logout")
}
metrics.ObserveLogout(metrics.LogoutOperationFrontChannel)

2
pkg/handler/handler_login.go
View File

@@ -41,7 +41,7 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
fields := log.Fields{
"redirect_after_login": login.CanonicalRedirect(),
}
logentry.LogEntry(r).WithFields(fields).Info("login: redirecting to identity provider")
logentry.LogEntry(r).WithFields(fields).Debug("login: redirecting to identity provider")
http.Redirect(w, r, login.AuthCodeURL(), http.StatusTemporaryRedirect)
}

2
pkg/handler/handler_logout.go
View File

@@ -41,7 +41,7 @@ func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
h.Loginstatus.ClearCookie(w, h.CookieOptions)
}
logger.Info("logout: redirecting to identity provider")
logger.Debug("logout: redirecting to identity provider")
metrics.ObserveLogout(metrics.LogoutOperationSelfInitiated)
http.Redirect(w, r, h.Client.Logout().SingleLogoutURL(idToken), http.StatusTemporaryRedirect)
}

2
pkg/handler/handler_logout_callback.go
View File

@@ -10,6 +10,6 @@ import (
func (h *Handler) LogoutCallback(w http.ResponseWriter, r *http.Request) {
redirect := h.Client.LogoutCallback(r, h.Config.Ingress).PostLogoutRedirectURI()
logentry.LogEntry(r).Infof("logout/callback: redirecting to %s", redirect)
logentry.LogEntry(r).Debugf("logout/callback: redirecting to %s", redirect)
http.Redirect(w, r, redirect, http.StatusTemporaryRedirect)
}