mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
24189b2c36
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.
I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).
I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄
Signed-off-by: Andrew Page <admwiggin@gmail.com>
46 lines
1.3 KiB
Go
46 lines
1.3 KiB
Go
package builder
|
|
|
|
import (
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
var (
|
|
// `\\\\+|[^\\]|\b|\A` - match any number of "\\" (ie, properly-escaped backslashes), or a single non-backslash character, or a word boundary, or beginning-of-line
|
|
// `\$` - match literal $
|
|
// `[[:alnum:]_]+` - match things like `$SOME_VAR`
|
|
// `{[[:alnum:]_]+}` - match things like `${SOME_VAR}`
|
|
tokenEnvInterpolation = regexp.MustCompile(`(\\\\+|[^\\]|\b|\A)\$([[:alnum:]_]+|{[[:alnum:]_]+})`)
|
|
// this intentionally punts on more exotic interpolations like ${SOME_VAR%suffix} and lets the shell handle those directly
|
|
)
|
|
|
|
// handle environment replacement. Used in dispatcher.
|
|
func (b *Builder) replaceEnv(str string) string {
|
|
for _, match := range tokenEnvInterpolation.FindAllString(str, -1) {
|
|
match = match[strings.Index(match, "$"):]
|
|
matchKey := strings.Trim(match, "${}")
|
|
|
|
for _, keyval := range b.Config.Env {
|
|
tmp := strings.SplitN(keyval, "=", 2)
|
|
if tmp[0] == matchKey {
|
|
str = strings.Replace(str, match, tmp[1], -1)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
return str
|
|
}
|
|
|
|
func handleJsonArgs(args []string, attributes map[string]bool) []string {
|
|
if len(args) == 0 {
|
|
return []string{}
|
|
}
|
|
|
|
if attributes != nil && attributes["json"] {
|
|
return args
|
|
}
|
|
|
|
// literal string command, not an exec array
|
|
return []string{strings.Join(args, " ")}
|
|
}
|