Added env variables to control args scrubbing

Author: mbotarro

config/config.go

@@ -411,6 +411,17 @@ func mergeEnv(c *AgentConfig) *AgentConfig {
 		}
 	}
 
+	// Process Arguments Scrubbing
+	if enabled, err := isAffirmative(os.Getenv("DD_SCRUB_ARGS")); enabled {
+		c.Scrubber.Enabled = true
+	} else if !enabled && err == nil {
+		c.Scrubber.Enabled = false
+	}
+
+	if v := os.Getenv("DD_CUSTOM_SENSITIVE_WORDS"); v != "" {
+		c.Scrubber.AddCustomSensitiveWords(strings.Split(v, ","))
+	}
+
 	if v := os.Getenv("DD_AGENT_PY"); v != "" {
 		c.DDAgentPy = v
 	}

config/config_test.go

@@ -78,6 +78,54 @@ func TestOnlyEnvConfig(t *testing.T) {
 	os.Setenv("DD_API_KEY", "")
 }
 
+func TestOnlyEnvConfigArgsScrubbingEnabled(t *testing.T) {
+	os.Setenv("DD_SCRUB_ARGS", "true")
+	os.Setenv("DD_CUSTOM_SENSITIVE_WORDS", "*password*,consul_token,*api_key")
+
+	agentConfig, _ := NewAgentConfig(nil, nil)
+	assert.Equal(t, true, agentConfig.Scrubber.Enabled)
+
+	cases := []struct {
+		cmdline       []string
+		parsedCmdline []string
+	}{
+		{[]string{"spidly", "--mypasswords=123,456", "consul_token", "1234", "--dd_api_key=1234"},
+			[]string{"spidly", "--mypasswords=********", "consul_token", "********", "--dd_api_key=********"}},
+	}
+
+	for i := range cases {
+		cases[i].cmdline = agentConfig.Scrubber.ScrubCmdline(cases[i].cmdline)
+		assert.Equal(t, cases[i].parsedCmdline, cases[i].cmdline)
+	}
+
+	os.Setenv("DD_SCRUB_ARGS", "")
+	os.Setenv("DD_CUSTOM_SENSITIVE_WORDS", "")
+}
+
+func TestOnlyEnvConfigArgsScrubbingDisabled(t *testing.T) {
+	os.Setenv("DD_SCRUB_ARGS", "false")
+	os.Setenv("DD_CUSTOM_SENSITIVE_WORDS", "*password*,consul_token,*api_key")
+
+	agentConfig, _ := NewAgentConfig(nil, nil)
+	assert.Equal(t, false, agentConfig.Scrubber.Enabled)
+
+	cases := []struct {
+		cmdline       []string
+		parsedCmdline []string
+	}{
+		{[]string{"spidly", "--mypasswords=123,456", "consul_token", "1234", "--dd_api_key=1234"},
+			[]string{"spidly", "--mypasswords=123,456", "consul_token", "1234", "--dd_api_key=1234"}},
+	}
+
+	for i := range cases {
+		cases[i].cmdline = agentConfig.Scrubber.ScrubCmdline(cases[i].cmdline)
+		assert.Equal(t, cases[i].parsedCmdline, cases[i].cmdline)
+	}
+
+	os.Setenv("DD_SCRUB_ARGS", "")
+	os.Setenv("DD_CUSTOM_SENSITIVE_WORDS", "")
+}
+
 func TestConfigNewIfExists(t *testing.T) {
 	// The file does not exist: no error returned
 	conf, err := NewIfExists("/does-not-exist")