dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Escape environment variables during config toml parsing (#3637)

This commit is contained in:
Daniel Nelson 2018-01-04 15:28:00 -08:00 committed by GitHub
parent 11c6a7f9c9
commit b0c2bb870e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/config/config.go
View File

@ -40,6 +40,11 @@ var (
// envVarRe is a regex to find environment variables in the config file // envVarRe is a regex to find environment variables in the config file
envVarRe = regexp.MustCompile(`\$\w+`) envVarRe = regexp.MustCompile(`\$\w+`)
envVarEscaper = strings.NewReplacer(
`"`, `\"`,
`\`, `\\`,
)
) )
// Config specifies the URL/user/password for the database that telegraf // Config specifies the URL/user/password for the database that telegraf
@ -689,6 +694,11 @@ func trimBOM(f []byte) []byte {
return bytes.TrimPrefix(f, []byte("\xef\xbb\xbf")) return bytes.TrimPrefix(f, []byte("\xef\xbb\xbf"))
} }
// escapeEnv escapes a value for inserting into a TOML string.
func escapeEnv(value string) string {
return envVarEscaper.Replace(value)
}
// parseFile loads a TOML configuration from a provided path and // parseFile loads a TOML configuration from a provided path and
// returns the AST produced from the TOML parser. When loading the file, it // returns the AST produced from the TOML parser. When loading the file, it
// will find environment variables and replace them. // will find environment variables and replace them.
@ -702,8 +712,9 @@ func parseFile(fpath string) (*ast.Table, error) {
env_vars := envVarRe.FindAll(contents, -1) env_vars := envVarRe.FindAll(contents, -1)
for _, env_var := range env_vars { for _, env_var := range env_vars {
env_val := os.Getenv(strings.TrimPrefix(string(env_var), "$")) env_val, ok := os.LookupEnv(strings.TrimPrefix(string(env_var), "$"))
if env_val != "" { if ok {
env_val = escapeEnv(env_val)
contents = bytes.Replace(contents, env_var, []byte(env_val), 1) contents = bytes.Replace(contents, env_var, []byte(env_val), 1)
} }
} }