From 884bd3581eed8fa3f696f530ff12951c7d688705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 22 Jan 2020 10:54:46 +0000 Subject: [PATCH] fix(backend): mask credentials in error logs Fixes #1363 --- cmd/karma/main.go | 7 ++++--- internal/alertmanager/upstream.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/karma/main.go b/cmd/karma/main.go index a48b433d8..5de3251b2 100644 --- a/cmd/karma/main.go +++ b/cmd/karma/main.go @@ -17,6 +17,7 @@ import ( "github.com/prymitive/karma/internal/config" "github.com/prymitive/karma/internal/models" "github.com/prymitive/karma/internal/transform" + "github.com/prymitive/karma/internal/uri" "github.com/DeanThompson/ginpprof" "github.com/gin-contrib/cors" @@ -125,7 +126,7 @@ func setupUpstreams() { if s.TLS.CA != "" || s.TLS.Cert != "" || s.TLS.InsecureSkipVerify { httpTransport, err = alertmanager.NewHTTPTransport(s.TLS.CA, s.TLS.Cert, s.TLS.Key, s.TLS.InsecureSkipVerify) if err != nil { - log.Fatalf("Failed to create HTTP transport for Alertmanager '%s' with URI '%s': %s", s.Name, s.URI, err) + log.Fatalf("Failed to create HTTP transport for Alertmanager '%s' with URI '%s': %s", s.Name, uri.SanitizeURI(s.URI), err) } } @@ -139,11 +140,11 @@ func setupUpstreams() { alertmanager.WithHTTPHeaders(s.Headers), ) if err != nil { - log.Fatalf("Failed to create Alertmanager '%s' with URI '%s': %s", s.Name, s.URI, err) + log.Fatalf("Failed to create Alertmanager '%s' with URI '%s': %s", s.Name, uri.SanitizeURI(s.URI), err) } err = alertmanager.RegisterAlertmanager(am) if err != nil { - log.Fatalf("Failed to register Alertmanager '%s' with URI '%s': %s", s.Name, s.URI, err) + log.Fatalf("Failed to register Alertmanager '%s' with URI '%s': %s", s.Name, uri.SanitizeURI(s.URI), err) } } } diff --git a/internal/alertmanager/upstream.go b/internal/alertmanager/upstream.go index daeb1542c..b877be0e6 100644 --- a/internal/alertmanager/upstream.go +++ b/internal/alertmanager/upstream.go @@ -69,11 +69,11 @@ func RegisterAlertmanager(am *Alertmanager) error { for _, existingAM := range upstreams { if existingAM.URI == am.URI { - return fmt.Errorf("alertmanager upstream '%s' already collects from '%s'", existingAM.Name, existingAM.URI) + return fmt.Errorf("alertmanager upstream '%s' already collects from '%s'", existingAM.Name, uri.SanitizeURI(existingAM.URI)) } } upstreams[am.Name] = am - log.Infof("[%s] Configured Alertmanager source at %s (proxied: %v)", am.Name, am.URI, am.ProxyRequests) + log.Infof("[%s] Configured Alertmanager source at %s (proxied: %v)", am.Name, uri.SanitizeURI(am.URI), am.ProxyRequests) return nil }