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

refactor: route errors should still log at least warning

Browse Source
This commit is contained in:
Trong Huu Nguyen
2022-02-10 15:40:10 +01:00
parent 714fc7e34f
commit 785186bf5a
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/router/handler_callback.go
View File

@@ -7,7 +7,6 @@ import (
"net/http"
"time"
"github.com/rs/zerolog"
log "github.com/sirupsen/logrus"
"golang.org/x/oauth2"
@@ -20,12 +19,9 @@ func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) {
if err != nil {
msg := "callback: fetching login cookie"
if errors.Is(err, http.ErrNoCookie) {
msg += ": fallback cookie not found"
msg += "; user might have blocked all cookies or the callback route was accessed before the login route"
h.UnauthorizedWithLevel(w, r, fmt.Errorf("%s: %w", msg, err), zerolog.InfoLevel)
} else {
h.Unauthorized(w, r, fmt.Errorf("%s: %w", msg, err))
msg += ": fallback cookie not found (user might have blocked all cookies, or the callback route was accessed before the login route)"
}
h.Unauthorized(w, r, fmt.Errorf("%s: %w", msg, err))
return
}
@@ -38,7 +34,7 @@ func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) {
}
if params.Get("state") != loginCookie.State {
h.Unauthorized(w, r, fmt.Errorf("callback: state parameter mismatch"))
h.Unauthorized(w, r, fmt.Errorf("callback: state parameter mismatch (possible csrf)"))
return
}

6
pkg/router/handler_error.go
View File

@@ -95,9 +95,5 @@ func (h *Handler) BadRequest(w http.ResponseWriter, r *http.Request, cause error
}
func (h *Handler) Unauthorized(w http.ResponseWriter, r *http.Request, cause error) {
h.UnauthorizedWithLevel(w, r, cause, zerolog.WarnLevel)
}
func (h *Handler) UnauthorizedWithLevel(w http.ResponseWriter, r *http.Request, cause error, level zerolog.Level) {
h.respondError(w, r, http.StatusUnauthorized, cause, level)
h.respondError(w, r, http.StatusUnauthorized, cause, zerolog.WarnLevel)
}

2
pkg/router/handler_frontchannellogout.go
View File

@@ -28,7 +28,7 @@ func (h *Handler) FrontChannelLogout(w http.ResponseWriter, r *http.Request) {
sessionID := h.localSessionID(sid)
sessionData, err := h.getSession(r.Context(), sessionID)
if err != nil {
log.Infof("front-channel logout: getting session (user might already be logged out): %+v", err)
log.Warnf("front-channel logout: getting session (user might already be logged out): %+v", err)
}
err = h.destroySession(w, r, sessionID)