Skip to content

Commit

Permalink
fix: reject docker.files as . or inside dist (#1175)
Browse files Browse the repository at this point in the history
* fix: reject docker.files as . or inside dist

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: deprecated method

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
  • Loading branch information
caarlos0 committed Oct 6, 2019
1 parent 792b883 commit 4233084
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
5 changes: 5 additions & 0 deletions internal/pipe/docker/docker.go
Expand Up @@ -40,6 +40,11 @@ func (Pipe) Default(ctx *context.Context) error {
if docker.Goarch == "" {
docker.Goarch = "amd64"
}
for _, f := range docker.Files {
if f == "." || strings.HasPrefix(f, ctx.Config.Dist) {
return fmt.Errorf("invalid docker.files: can't be . or inside dist folder: %s", f)
}
}
}
// only set defaults if there is exactly 1 docker setup in the config file.
if len(ctx.Config.Dockers) != 1 {
Expand Down
28 changes: 28 additions & 0 deletions internal/pipe/docker/docker_test.go
Expand Up @@ -732,6 +732,34 @@ func TestDefaultNoDockers(t *testing.T) {
assert.Empty(t, ctx.Config.Dockers)
}

func TestDefaultFilesDot(t *testing.T) {
var ctx = &context.Context{
Config: config.Project{
Dist: "/tmp/distt",
Dockers: []config.Docker{
{
Files: []string{"./lala", "./lolsob", "."},
},
},
},
}
assert.EqualError(t, Pipe{}.Default(ctx), `invalid docker.files: can't be . or inside dist folder: .`)
}

func TestDefaultFilesDis(t *testing.T) {
var ctx = &context.Context{
Config: config.Project{
Dist: "/tmp/dist",
Dockers: []config.Docker{
{
Files: []string{"./fooo", "/tmp/dist/asdasd/asd", "./bar"},
},
},
},
}
assert.EqualError(t, Pipe{}.Default(ctx), `invalid docker.files: can't be . or inside dist folder: /tmp/dist/asdasd/asd`)
}

func TestDefaultSet(t *testing.T) {
var ctx = &context.Context{
Config: config.Project{
Expand Down

0 comments on commit 4233084

Please sign in to comment.