github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8448 from dmcgowan/archive-tests-darwin

Browse Source 
Update tar tests to run on Darwin
This commit is contained in:
Fu Wei 2023-04-26 16:48:28 +08:00 committed by GitHub
commit 634b123e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 75 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
archive/tar_test.go
View File

@ -1,4 +1,4 @@
//go:build !windows && !darwin //go:build !windows
/* /*
Copyright The containerd Authors. Copyright The containerd Authors.
@ -28,6 +28,7 @@ import (
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"testing" "testing"
"time" "time"
@ -359,13 +360,14 @@ func TestBreakouts(t *testing.T) {
} }
} }
breakouts := []struct { type breakoutTest struct {
name string name string
w tartest.WriterToTar w tartest.WriterToTar
apply fstest.Applier apply fstest.Applier
validator func(string) error validator func(string) error
err error err error
}{ }
breakouts := []breakoutTest{
{ {
name: "SymlinkAbsolute", name: "SymlinkAbsolute",
w: tartest.TarAll( w: tartest.TarAll(
@ -497,42 +499,7 @@ func TestBreakouts(t *testing.T) {
), ),
validator: sameFile("localpasswd", "/etc/passwd"), validator: sameFile("localpasswd", "/etc/passwd"),
}, },
{
name: "HardlinkSymlinkBeforeCreateTarget",
w: tartest.TarAll(
tc.Dir("etc", 0770),
tc.Symlink("/etc/passwd", "localpasswd"),
tc.Link("localpasswd", "localpasswd-dup"),
tc.File("/etc/passwd", []byte("after"), 0644),
),
validator: sameFile("localpasswd-dup", "/etc/passwd"),
},
{
name: "HardlinkSymlinkRelative",
w: tartest.TarAll(
tc.Dir("etc", 0770),
tc.File("/etc/passwd", []byte("inside"), 0644),
tc.Symlink("../../../../../etc/passwd", "passwdlink"),
tc.Link("/passwdlink", "localpasswd"),
),
validator: all(
sameSymlinkFile("/localpasswd", "/passwdlink"),
sameFile("/localpasswd", "/etc/passwd"),
),
},
{
name: "HardlinkSymlinkAbsolute",
w: tartest.TarAll(
tc.Dir("etc", 0770),
tc.File("/etc/passwd", []byte("inside"), 0644),
tc.Symlink("/etc/passwd", "passwdlink"),
tc.Link("/passwdlink", "localpasswd"),
),
validator: all(
sameSymlinkFile("/localpasswd", "/passwdlink"),
sameFile("/localpasswd", "/etc/passwd"),
),
},
{ {
name: "SymlinkParentDirectory", name: "SymlinkParentDirectory",
w: tartest.TarAll( w: tartest.TarAll(
@ -745,36 +712,77 @@ func TestBreakouts(t *testing.T) {
// resolution ends up just removing etc // resolution ends up just removing etc
validator: fileNotExists("etc/passwd"), validator: fileNotExists("etc/passwd"),
}, },
{ }
name: "HardlinkSymlinkChmod", // The follow tests perform operations not permitted on Darwin
w: func() tartest.WriterToTar { if runtime.GOOS != "darwin" {
p := filepath.Join(td, "perm400") breakouts = append(breakouts, []breakoutTest{
if err := os.WriteFile(p, []byte("..."), 0400); err != nil { {
t.Fatal(err) name: "HardlinkSymlinkBeforeCreateTarget",
} w: tartest.TarAll(
ep := filepath.Join(td, "also-exists-outside-root") tc.Dir("etc", 0770),
if err := os.WriteFile(ep, []byte("..."), 0640); err != nil { tc.Symlink("/etc/passwd", "localpasswd"),
t.Fatal(err) tc.Link("localpasswd", "localpasswd-dup"),
} tc.File("/etc/passwd", []byte("after"), 0644),
),
return tartest.TarAll( validator: sameFile("localpasswd-dup", "/etc/passwd"),
tc.Symlink(p, ep),
tc.Link(ep, "sketchylink"),
)
}(),
validator: func(string) error {
p := filepath.Join(td, "perm400")
fi, err := os.Lstat(p)
if err != nil {
return err
}
if perm := fi.Mode() & os.ModePerm; perm != 0400 {
return fmt.Errorf("%s perm changed from 0400 to %04o", p, perm)
}
return nil
}, },
}, {
name: "HardlinkSymlinkRelative",
w: tartest.TarAll(
tc.Dir("etc", 0770),
tc.File("/etc/passwd", []byte("inside"), 0644),
tc.Symlink("../../../../../etc/passwd", "passwdlink"),
tc.Link("/passwdlink", "localpasswd"),
),
validator: all(
sameSymlinkFile("/localpasswd", "/passwdlink"),
sameFile("/localpasswd", "/etc/passwd"),
),
},
{
name: "HardlinkSymlinkAbsolute",
w: tartest.TarAll(
tc.Dir("etc", 0770),
tc.File("/etc/passwd", []byte("inside"), 0644),
tc.Symlink("/etc/passwd", "passwdlink"),
tc.Link("/passwdlink", "localpasswd"),
),
validator: all(
sameSymlinkFile("/localpasswd", "/passwdlink"),
sameFile("/localpasswd", "/etc/passwd"),
),
},
{
name: "HardlinkSymlinkChmod",
w: func() tartest.WriterToTar {
p := filepath.Join(td, "perm400")
if err := os.WriteFile(p, []byte("..."), 0400); err != nil {
t.Fatal(err)
}
ep := filepath.Join(td, "also-exists-outside-root")
if err := os.WriteFile(ep, []byte("..."), 0640); err != nil {
t.Fatal(err)
}
return tartest.TarAll(
tc.Symlink(p, ep),
tc.Link(ep, "sketchylink"),
)
}(),
validator: func(string) error {
p := filepath.Join(td, "perm400")
fi, err := os.Lstat(p)
if err != nil {
return err
}
if perm := fi.Mode() & os.ModePerm; perm != 0400 {
return fmt.Errorf("%s perm changed from 0400 to %04o", p, perm)
}
return nil
},
},
}...)
} }
for _, bo := range breakouts { for _, bo := range breakouts {