refactor: only log route requests for owned routes

Co-authored-by: Morten Lied Johansen <morten.lied.johansen@nav.no>
Co-Authored-By: Sindre Rødseth Hansen <sindre.rodseth.hansen@nav.no>

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
 	}
 

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)