From d58e3339a91f5c96768a3ff04114b74e441fa876 Mon Sep 17 00:00:00 2001 From: Trong Huu Nguyen Date: Tue, 12 Oct 2021 10:24:22 +0200 Subject: [PATCH] refactor: only log route requests for owned routes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Morten Lied Johansen Co-Authored-By: Sindre Rødseth Hansen --- pkg/router/handler_callback.go | 8 ++++---- pkg/router/router.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/router/handler_callback.go b/pkg/router/handler_callback.go index 7011dec..cf42a48 100644 --- a/pkg/router/handler_callback.go +++ b/pkg/router/handler_callback.go @@ -46,13 +46,13 @@ func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) { tokens, err := h.OauthConfig.Exchange(r.Context(), params.Get("code"), opts...) if err != nil { - h.Unauthorized(w, r, fmt.Errorf("callback: exchanging code: %w", err)) + h.InternalError(w, r, fmt.Errorf("callback: exchanging code: %w", err)) return } idToken, err := token.ParseIDToken(h.jwkSet, tokens) if err != nil { - h.Unauthorized(w, r, fmt.Errorf("callback: parsing id_token: %w", err)) + h.InternalError(w, r, fmt.Errorf("callback: parsing id_token: %w", err)) return } @@ -70,13 +70,13 @@ func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) { err = idToken.Validate(validateOpts...) if err != nil { - h.Unauthorized(w, r, fmt.Errorf("callback: validating id_token: %w", err)) + h.InternalError(w, r, fmt.Errorf("callback: validating id_token: %w", err)) return } externalSessionID, ok := idToken.GetSID() if !ok { - h.Unauthorized(w, r, fmt.Errorf("callback: missing required 'sid' claim in id_token")) + h.InternalError(w, r, fmt.Errorf("callback: missing required 'sid' claim in id_token")) return } diff --git a/pkg/router/router.go b/pkg/router/router.go index 9903364..3f3f43e 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -11,13 +11,13 @@ import ( func New(handler *Handler) chi.Router { r := chi.NewRouter() r.Use(middleware.CorrelationIDHandler) - r.Use(middleware.LogEntryHandler(handler.httplogger)) r.Use(chi_middleware.Recoverer) prometheusMiddleware := middleware.NewPrometheusMiddleware("wonderwall") prefix := config.ParseIngress(handler.Config.Ingress) r.Route(prefix+"/oauth2", func(r chi.Router) { + r.Use(middleware.LogEntryHandler(handler.httplogger)) r.Use(prometheusMiddleware.Handler) r.Use(chi_middleware.NoCache) r.Get("/login", handler.Login)