grim/convey

Merge.
inject
2017-10-13, Eric Fritz
f52cce4913a6
Parents f37bad7a9b8364afa024b3bf
Children fa4c9211acd1
Merge.
5 files changed, 90 insertions(+), 6 deletions(-)
  • +1 -1
    docker/run.go
  • +12 -3
    environment/mapper.go
  • +7 -2
    environment/mapper_test.go
  • +38 -0
    environment/prune.go
  • +32 -0
    environment/prune_test.go
    • --- a/docker/run.go Fri Oct 13 12:04:21 2017 -0500
    +++ b/docker/run.go Fri Oct 13 12:05:37 2017 -0500
    @@ -231,7 +231,7 @@
    "CPUShares": st.CPUShares,
    "Detach": r.Detach,
    "Hostname": hostname,
    - "Environment": fullEnv,
    + "Environment": environment.Prune(fullEnv),
    "EntryPoint": entryPoint,
    "GID": user.Gid,
    "HealthCheck": r.HealthCheck,
    --- a/environment/mapper.go Fri Oct 13 12:04:21 2017 -0500
    +++ b/environment/mapper.go Fri Oct 13 12:05:37 2017 -0500
    @@ -27,6 +27,10 @@
    env []string
    }
    +const (
    + MaxExpandWidth = 100
    +)
    +
    func (e *envMapper) Map(name string) string {
    for _, item := range e.env {
    if parts := strings.SplitN(item, "=", 2); parts[0] == name {
    @@ -53,13 +57,18 @@
    func Mapper(str string, env []string) (string, error) {
    mapper := envMapper{env}
    + orig := str
    last := str
    next := os.Expand(last, mapper.Map)
    prev := map[string]struct{}{}
    - for last != next {
    + for i := 0; i < MaxExpandWidth; i++ {
    + if last == next {
    + return next, nil
    + }
    +
    if _, ok := prev[next]; ok {
    - return "", fmt.Errorf("infinite environment mapping loop while expanding '%s'", next)
    + break
    }
    last = next
    @@ -67,7 +76,7 @@
    prev[last] = struct{}{}
    }
    - return next, nil
    + return "", fmt.Errorf("infinite environment mapping loop while expanding '%s'", orig)
    }
    // SliceMapper calls Mapper for each item in a slice and returns a new slice.
    --- a/environment/mapper_test.go Fri Oct 13 12:04:21 2017 -0500
    +++ b/environment/mapper_test.go Fri Oct 13 12:05:37 2017 -0500
    @@ -75,7 +75,12 @@
    Expect(result).To(Equal("123-ohhai!-cba"))
    }
    -func (e *environmentSuite) TestInfiniteExpansion(t sweet.T) {
    +func (e *environmentSuite) TestInfiniteDepthExpansion(t sweet.T) {
    _, err := Mapper("${FOO}", []string{"FOO=$BAR", "BAR=$FOO"})
    - Expect(err).To(MatchError("infinite environment mapping loop while expanding '$BAR'"))
    + Expect(err).To(MatchError("infinite environment mapping loop while expanding '${FOO}'"))
    }
    +
    +func (e *environmentSuite) TestInfiniteWidthExpansion(t sweet.T) {
    + _, err := Mapper("${FOO}", []string{"FOO=FOO${FOO}"})
    + Expect(err).To(MatchError("infinite environment mapping loop while expanding '${FOO}'"))
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/environment/prune.go Fri Oct 13 12:05:37 2017 -0500
    @@ -0,0 +1,38 @@
    +/*
    + * Convey
    + * Copyright 2016-2017 Gary Kramlich <grim@reaperworld.com>
    + *
    + * This program is free software: you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License as published by
    + * the Free Software Foundation, either version 3 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    + */
    +package environment
    +
    +import (
    + "os"
    +)
    +
    +// Prune removes all empty-value variables from the environment.
    +func Prune(env []string) []string {
    + pruned := []string{}
    +
    + for _, val := range env {
    + k, v := splitEqual(val)
    + if v == "" && os.Getenv(k) == "" {
    + continue
    + }
    +
    + pruned = append(pruned, val)
    + }
    +
    + return pruned
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/environment/prune_test.go Fri Oct 13 12:05:37 2017 -0500
    @@ -0,0 +1,32 @@
    +/*
    + * Convey
    + * Copyright 2016-2017 Gary Kramlich <grim@reaperworld.com>
    + *
    + * This program is free software: you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License as published by
    + * the Free Software Foundation, either version 3 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    + */
    +package environment
    +
    +import (
    + "os"
    +
    + "github.com/aphistic/sweet"
    + . "github.com/onsi/gomega"
    +)
    +
    +func (e *environmentSuite) TestPrune(t sweet.T) {
    + os.Clearenv()
    + os.Setenv("BONK", "not-empty")
    +
    + Expect(Prune([]string{"FOO=bar", "BAZ", "BONK", "QUUX="})).To(Equal([]string{"FOO=bar", "BONK"}))
    +}