Elide token-only credentials in cli arguments

Follow-up of #2568
weaveworks · Jun 13, 2017 · 11355bb · 11355bb
1 parent f403d01
commit 11355bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/prog/main.go b/prog/main.go
@@ -41,7 +41,7 @@ var (
 	}
 	colonFinder         = regexp.MustCompile(`[^\\](:)`)
 	unescapeBackslashes = regexp.MustCompile(`\\(.)`)
-	elideURLCredentials = regexp.MustCompile(`//.+:.+@`)
+	elideURLCredentials = regexp.MustCompile(`//.+@`)
 )
 
 type prefixFormatter struct {

diff --git a/prog/main_test.go b/prog/main_test.go
@@ -36,6 +36,7 @@ func TestLogCensoredArgs(t *testing.T) {
 		"-probe.kubernetes.token=secret",
 		"http://secret:secret@frontend.dev.weave.works:80",
 		"https://secret:secret@cloud.weave.works:443",
+		"https://secret@cloud.weave.works",
 	}
 	flag.CommandLine.Parse(args)