mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1150 from prometheus/kerckhoff-principle

Browse source 
config: Don't hide username, it's not secret.
This commit is contained in:
Fabian Reinartz 2015-10-08 16:50:34 +02:00
parent be8b83f48f 1ddf75240d
commit 9cba38c6da
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.go
View file

@ -33,7 +33,7 @@ var (
patJobName = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_-]*$`) patJobName = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_-]*$`)
patFileSDName = regexp.MustCompile(`^[^*]*(\*[^/]*)?\.(json|yml|yaml|JSON|YML|YAML)$`) patFileSDName = regexp.MustCompile(`^[^*]*(\*[^/]*)?\.(json|yml|yaml|JSON|YML|YAML)$`)
patRulePath = regexp.MustCompile(`^[^*]*(\*[^/]*)?$`) patRulePath = regexp.MustCompile(`^[^*]*(\*[^/]*)?$`)
patAuthLine = regexp.MustCompile(`((?:username|password|bearer_token|secret_key):\s+)(".+"|'.+'|[^\s]+)`) patAuthLine = regexp.MustCompile(`((?:password|bearer_token|secret_key):\s+)(".+"|'.+'|[^\s]+)`)
) )
// Load parses the YAML input s into a Config. // Load parses the YAML input s into a Config.

2
config/config_test.go
View file

@ -282,7 +282,7 @@ func TestLoadConfig(t *testing.T) {
// String method must not reveal authentication credentials. // String method must not reveal authentication credentials.
s := c.String() s := c.String()
if strings.Contains(s, "admin_name") || strings.Contains(s, "admin_password") { if strings.Contains(s, "admin_password") {
t.Fatalf("config's String method reveals authentication credentials.") t.Fatalf("config's String method reveals authentication credentials.")
} }
} }