From bd913aea1f3b6174579b2efd55dfd83f38c35f9c Mon Sep 17 00:00:00 2001 From: Philip Laine Date: Wed, 7 Jul 2021 23:49:44 +0200 Subject: [PATCH] Add path to auth proxy logs --- pkg/server/server.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/server/server.go b/pkg/server/server.go index 2ea9f7f..d03b05b 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -70,28 +70,30 @@ func proxyHandler(logger logr.Logger, proxies map[string]*httputil.ReverseProxy, return } + handlerLogger := logger.WithValues("path", r.URL.Path) + // Check basic auth with local auth configuration err = authz.IsPermitted(r.URL.EscapedPath(), token) if err != nil { - logger.Error(err, "Received unauthorized request") + handlerLogger.Error(err, "Received unauthorized request") http.Error(w, "User not permitted", http.StatusForbidden) return } pat, err := authz.GetPatForToken(token) if err != nil { - logger.Error(err, "Could not find the PAT for the given token") + handlerLogger.Error(err, "Could not find the PAT for the given token") http.Error(w, "Internal server error", http.StatusInternalServerError) return } target, err := authz.GetTargetForToken(token) if err != nil { - logger.Error(err, "Target could not be created from the token") + handlerLogger.Error(err, "Target could not be created from the token") http.Error(w, "Internal server error", http.StatusInternalServerError) return } // Overwrite the authorization header with the PAT token - logger.Info("Authenticated request", "path", r.URL.Path) + handlerLogger.Info("Authenticated request") r.Host = target.Host r.Header.Del("Authorization") patB64 := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("pat:%s", pat))) @@ -100,7 +102,7 @@ func proxyHandler(logger logr.Logger, proxies map[string]*httputil.ReverseProxy, // Forward the request to the correct proxy proxy, ok := proxies[target.String()] if !ok { - logger.Info("missing proxy for target") + handlerLogger.Info("missing proxy for target") http.Error(w, "Internal server error", http.StatusInternalServerError) return }