mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00

The fillGo18FileTypeBits func was added in1a451d9a7b
to keep the tar headers consistent with headers created with go1.8 and older. go1.8 and older incorrectly preserved all file-mode bits, including file-type, instead of stripping those bits and only preserving the _permission_ bits, as defined in; - the GNU tar spec: https://www.gnu.org/software/tar/manual/html_node/Standard.html - and POSIX: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/tar.h.html We decided at the time to copy the "wrong" behavior to prevent a cache-bust and to keep the archives identical, however: - It's not matching the standards, which causes differences between our tar implementation and the standard tar implementations, as well as implementations in other languages, such as Python (see docker/compose#883). - BuildKit does not implement this hack. - We don't _need_ this extra information (as it's already preserved in the type header; https://pkg.go.dev/archive/tar#pkg-constants In short; let's remove this hack. This reverts commit1a451d9a7b
. This reverts commit41eb61d5c2
. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
150 lines
3.6 KiB
Go
150 lines
3.6 KiB
Go
package remotecontext // import "github.com/docker/docker/builder/remotecontext"
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/builder"
|
|
"github.com/docker/docker/pkg/archive"
|
|
"github.com/docker/docker/pkg/reexec"
|
|
"github.com/pkg/errors"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
const (
|
|
filename = "test"
|
|
contents = "contents test"
|
|
)
|
|
|
|
func init() {
|
|
reexec.Init()
|
|
}
|
|
|
|
func TestCloseRootDirectory(t *testing.T) {
|
|
contextDir, err := os.MkdirTemp("", "builder-tarsum-test")
|
|
defer os.RemoveAll(contextDir)
|
|
if err != nil {
|
|
t.Fatalf("Error with creating temporary directory: %s", err)
|
|
}
|
|
|
|
src := makeTestArchiveContext(t, contextDir)
|
|
err = src.Close()
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error while executing Close: %s", err)
|
|
}
|
|
|
|
_, err = os.Stat(src.Root().Path())
|
|
|
|
if !errors.Is(err, os.ErrNotExist) {
|
|
t.Fatal("Directory should not exist at this point")
|
|
}
|
|
}
|
|
|
|
func TestHashFile(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
|
|
defer cleanup()
|
|
|
|
createTestTempFile(t, contextDir, filename, contents, 0755)
|
|
|
|
tarSum := makeTestArchiveContext(t, contextDir)
|
|
|
|
sum, err := tarSum.Hash(filename)
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error when executing Stat: %s", err)
|
|
}
|
|
|
|
if len(sum) == 0 {
|
|
t.Fatalf("Hash returned empty sum")
|
|
}
|
|
|
|
expected := "55dfeb344351ab27f59aa60ebb0ed12025a2f2f4677bf77d26ea7a671274a9ca"
|
|
|
|
if actual := sum; expected != actual {
|
|
t.Fatalf("invalid checksum. expected %s, got %s", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestHashSubdir(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
|
|
defer cleanup()
|
|
|
|
contextSubdir := filepath.Join(contextDir, "builder-tarsum-test-subdir")
|
|
err := os.Mkdir(contextSubdir, 0755)
|
|
if err != nil {
|
|
t.Fatalf("Failed to make directory: %s", contextSubdir)
|
|
}
|
|
|
|
testFilename := createTestTempFile(t, contextSubdir, filename, contents, 0755)
|
|
|
|
tarSum := makeTestArchiveContext(t, contextDir)
|
|
|
|
relativePath, err := filepath.Rel(contextDir, testFilename)
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error when getting relative path: %s", err)
|
|
}
|
|
|
|
sum, err := tarSum.Hash(relativePath)
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error when executing Stat: %s", err)
|
|
}
|
|
|
|
if len(sum) == 0 {
|
|
t.Fatalf("Hash returned empty sum")
|
|
}
|
|
|
|
expected := "74a3326b8e766ce63a8e5232f22e9dd895be647fb3ca7d337e5e0a9b3da8ef28"
|
|
|
|
if actual := sum; expected != actual {
|
|
t.Fatalf("invalid checksum. expected %s, got %s", expected, actual)
|
|
}
|
|
}
|
|
|
|
func TestRemoveDirectory(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
|
|
defer cleanup()
|
|
|
|
contextSubdir := createTestTempSubdir(t, contextDir, "builder-tarsum-test-subdir")
|
|
|
|
relativePath, err := filepath.Rel(contextDir, contextSubdir)
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error when getting relative path: %s", err)
|
|
}
|
|
|
|
src := makeTestArchiveContext(t, contextDir)
|
|
|
|
_, err = src.Root().Stat(src.Root().Join(src.Root().Path(), relativePath))
|
|
if err != nil {
|
|
t.Fatalf("Statting %s shouldn't fail: %+v", relativePath, err)
|
|
}
|
|
|
|
tarSum := src.(modifiableContext)
|
|
err = tarSum.Remove(relativePath)
|
|
if err != nil {
|
|
t.Fatalf("Error when executing Remove: %s", err)
|
|
}
|
|
|
|
_, err = src.Root().Stat(src.Root().Join(src.Root().Path(), relativePath))
|
|
if !errors.Is(err, os.ErrNotExist) {
|
|
t.Fatalf("Directory should not exist at this point: %+v ", err)
|
|
}
|
|
}
|
|
|
|
func makeTestArchiveContext(t *testing.T, dir string) builder.Source {
|
|
skip.If(t, os.Getuid() != 0, "skipping test that requires root")
|
|
tarStream, err := archive.Tar(dir, archive.Uncompressed)
|
|
if err != nil {
|
|
t.Fatalf("error: %s", err)
|
|
}
|
|
defer tarStream.Close()
|
|
tarSum, err := FromArchive(tarStream)
|
|
if err != nil {
|
|
t.Fatalf("Error when executing FromArchive: %s", err)
|
|
}
|
|
return tarSum
|
|
}
|