From 500c8ba4b66c35cf2c29aeb81a9392cc406835a4 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 17 Mar 2014 17:11:27 -0400 Subject: [PATCH] env-file: variable behavior trim the front of variables. Error if there are other spaces present. Leave the value alone. Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) --- opts/envfile.go | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/opts/envfile.go b/opts/envfile.go index 99a713e761..19ee8955f9 100644 --- a/opts/envfile.go +++ b/opts/envfile.go @@ -25,11 +25,30 @@ func ParseEnvFile(filename string) ([]string, error) { if len(line) > 0 && !strings.HasPrefix(line, "#") { if strings.Contains(line, "=") { data := strings.SplitN(line, "=", 2) - lines = append(lines, fmt.Sprintf("%s=%s", data[0], data[1])) + + // trim the front of a variable, but nothing else + variable := strings.TrimLeft(data[0], whiteSpaces) + if strings.ContainsAny(variable, whiteSpaces) { + return []string{}, ErrBadEnvVariable{fmt.Sprintf("variable '%s' has white spaces", variable)} + } + + // pass the value through, no trimming + lines = append(lines, fmt.Sprintf("%s=%s", variable, data[1])) } else { - lines = append(lines, fmt.Sprintf("%s=%s", line, os.Getenv(line))) + // if only a pass-through variable is given, clean it up. + lines = append(lines, fmt.Sprintf("%s=%s", strings.TrimSpace(line), os.Getenv(line))) } } } return lines, nil } + +var whiteSpaces = " \t" + +type ErrBadEnvVariable struct { + msg string +} + +func (e ErrBadEnvVariable) Error() string { + return fmt.Sprintf("poorly formatted environment: %s", e.msg) +}