[ASCII-1006] Fix scrubber misuses key for http:// in urls (#32503)

DataDog · Dec 24, 2024 · 407d013 · 407d013
1 parent 3f413d8
commit 407d013
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pkg/util/scrubber/default.go b/pkg/util/scrubber/default.go
@@ -119,12 +119,13 @@ func AddDefaultReplacers(scrubber *Scrubber) {
 	// URI Generic Syntax
 	// https://tools.ietf.org/html/rfc3986
 	uriPasswordReplacer := Replacer{
-		Regex: regexp.MustCompile(`(?i)([a-z][a-z0-9+-.]+://|\b)([^:]+):([^\s|"]+)@`),
+		Regex: regexp.MustCompile(`(?i)([a-z][a-z0-9+-.]+://|\b)([^:\s]+):([^\s|"]+)@`),
 		Repl:  []byte(`$1$2:********@`),
 
-		// https://github.com/DataDog/datadog-agent/pull/15959
-		LastUpdated: parseVersion("7.45.0"),
+		// https://github.com/DataDog/datadog-agent/pull/32503
+		LastUpdated: parseVersion("7.63.0"),
 	}
+
 	yamlPasswordReplacer := matchYAMLKeyPart(
 		`(pass(word)?|pwd)`,
 		[]string{"pass", "pwd"},

diff --git a/pkg/util/scrubber/default_test.go b/pkg/util/scrubber/default_test.go
@@ -107,6 +107,12 @@ func TestConfigRCAppKey(t *testing.T) {
 }
 
 func TestConfigStripURLPassword(t *testing.T) {
+	assertClean(t,
+		`proxy: random_url_key: http://user:password@host:port`,
+		`proxy: random_url_key: http://user:********@host:port`)
+	assertClean(t,
+		`random_url_key http://user:password@host:port`,
+		`random_url_key http://user:********@host:port`)
 	assertClean(t,
 		`random_url_key: http://user:password@host:port`,
 		`random_url_key: http://user:********@host:port`)