Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion image/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ func NewDockerLocalImage(ctx context.Context, exportDir string, importDir string
tr := tar.NewReader(f)
hdr, err := tr.Next()
for ; err == nil; hdr, err = tr.Next() {
dir, fn := filepath.Split(hdr.Name)
// Docker export tar entries use slash-separated names; reject Tar Slip paths.
cleanName := filepath.Clean(filepath.FromSlash(hdr.Name))
if !filepath.IsLocal(cleanName) {
return nil, fmt.Errorf("invalid tar entry path %q", hdr.Name)
}

dir, fn := filepath.Split(cleanName)

if strings.HasSuffix(fn, ".tar") {
layerFilePath := ""
Expand Down
37 changes: 37 additions & 0 deletions image/docker_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package image

import (
"archive/tar"
"context"
"fmt"
"os"
"path/filepath"
"testing"
)

Expand All @@ -26,3 +28,38 @@ func TestFromExported(t *testing.T) {
}
fmt.Println(di)
}

func TestNewDockerLocalImage_rejectsTarSlipPaths(t *testing.T) {
tmp := t.TempDir()
tarPath := filepath.Join(tmp, "export.tar")
f, err := os.Create(tarPath)
if err != nil {
t.Fatal(err)
}
tw := tar.NewWriter(f)
hdr := &tar.Header{
Name: "../../../outside/evil.tar",
Mode: 0600,
Size: 0,
Typeflag: tar.TypeReg,
}
if err := tw.WriteHeader(hdr); err != nil {
t.Fatal(err)
}
if err := tw.Close(); err != nil {
t.Fatal(err)
}
if err := f.Close(); err != nil {
t.Fatal(err)
}

importDir := filepath.Join(tmp, "import")
if err := os.MkdirAll(importDir, 0700); err != nil {
t.Fatal(err)
}

_, err = NewDockerLocalImage(context.Background(), tarPath, importDir)
if err == nil {
t.Fatal("expected error for path traversal in tar entry name")
}
}