From bb69a3d2843061c3f6728f6e29a13d73730d3457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergiusz=20=27q3k=27=20Baza=C5=84ski?= <q3k@q3k.org>
Date: Thu, 19 Feb 2015 18:58:47 +0100
Subject: [PATCH] Hide HTTP auth parts from URL

This  instroduces an extra function in the Target interface (PublicURL)
which is used to populate the instance field in scraped metrics.
---
 retrieval/target.go             | 20 +++++++++++++++++---
 retrieval/target_test.go        | 13 +++++++++++++
 retrieval/targetmanager_test.go |  4 ++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/retrieval/target.go b/retrieval/target.go
index ddd0a0eb48..030bde0a94 100644
--- a/retrieval/target.go
+++ b/retrieval/target.go
@@ -17,6 +17,7 @@ import (
 	"fmt"
 	"math/rand"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"sync"
@@ -114,6 +115,8 @@ type Target interface {
 	// points in this interface, this one is the best candidate to change given
 	// the ways to express the endpoint.
 	URL() string
+	// The URL without any auth data in it, used to label data
+	PublicURL() string
 	// The URL as seen from other hosts. References to localhost are resolved
 	// to the address of the prometheus server.
 	GlobalURL() string
@@ -186,8 +189,8 @@ func (t *target) recordScrapeHealth(ingester extraction.Ingester, timestamp clie
 	}
 	healthMetric[clientmodel.MetricNameLabel] = clientmodel.LabelValue(scrapeHealthMetricName)
 	durationMetric[clientmodel.MetricNameLabel] = clientmodel.LabelValue(scrapeDurationMetricName)
-	healthMetric[InstanceLabel] = clientmodel.LabelValue(t.URL())
-	durationMetric[InstanceLabel] = clientmodel.LabelValue(t.URL())
+	healthMetric[InstanceLabel] = clientmodel.LabelValue(t.PublicURL())
+	durationMetric[InstanceLabel] = clientmodel.LabelValue(t.PublicURL())
 
 	healthValue := clientmodel.SampleValue(0)
 	if healthy {
@@ -320,7 +323,7 @@ func (t *target) scrape(ingester extraction.Ingester) (err error) {
 		return err
 	}
 
-	baseLabels := clientmodel.LabelSet{InstanceLabel: clientmodel.LabelValue(t.URL())}
+	baseLabels := clientmodel.LabelSet{InstanceLabel: clientmodel.LabelValue(t.PublicURL())}
 	for baseLabel, baseValue := range t.baseLabels {
 		baseLabels[baseLabel] = baseValue
 	}
@@ -363,6 +366,17 @@ func (t *target) URL() string {
 	return t.url
 }
 
+// PublicURL implements Target.
+func (t *target) PublicURL() string {
+	u, err := url.Parse(t.url)
+	if err != nil {
+		glog.Warning("Could not parse URL for auth stripping (%s), returning it unchanged", err)
+		return t.url
+	}
+	u.User = nil
+	return u.String()
+}
+
 // GlobalURL implements Target.
 func (t *target) GlobalURL() string {
 	url := t.url
diff --git a/retrieval/target_test.go b/retrieval/target_test.go
index cb84ef7e46..67909e5a74 100644
--- a/retrieval/target_test.go
+++ b/retrieval/target_test.go
@@ -34,6 +34,19 @@ func (i *collectResultIngester) Ingest(s clientmodel.Samples) error {
 	return nil
 }
 
+func TestTargetHidesURLAuth(t *testing.T) {
+	testTarget := target{
+		state:      Unknown,
+		url:        "http://secret:data@host.com/query?args#fragment",
+		httpClient: utility.NewDeadlineClient(0),
+	}
+	expected := "http://host.com/query?args#fragment"
+	u := testTarget.PublicURL()
+	if u != expected {
+		t.Errorf("Expected PublicURL to be %v, actual %v", expected, u)
+	}
+}
+
 func TestTargetScrapeUpdatesState(t *testing.T) {
 	testTarget := target{
 		state:      Unknown,
diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go
index fe1e97d498..917b5d3ca9 100644
--- a/retrieval/targetmanager_test.go
+++ b/retrieval/targetmanager_test.go
@@ -42,6 +42,10 @@ func (t fakeTarget) URL() string {
 	return "fake"
 }
 
+func (t fakeTarget) PublicURL() string {
+	return "fake"
+}
+
 func (t fakeTarget) GlobalURL() string {
 	return t.URL()
 }