Merge pull request #1672 from ryanmoran/main

Use OS-default permissions when creating archive root
buildpacks · Mar 24, 2023 · 11e71c7 · 11e71c7
2 parents 759d672 + 1186f6a
commit 11e71c7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/internal/build/container_ops_test.go b/internal/build/container_ops_test.go
@@ -181,7 +181,7 @@ drwxrwxrwx    2 123      456 (.*) some-vol
 					} else {
 						// Expected results
 						h.AssertContainsMatch(t, outBuf.String(), `
-drwsrwsrwt    2 123      456 (.*) some-vol
+drwxr-xr-x    2 123      456 (.*) some-vol
 `)
 					}
 				}

diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -5,6 +5,7 @@ import (
 	"archive/tar"
 	"archive/zip"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"time"
@@ -16,6 +17,7 @@ import (
 )
 
 var NormalizedDateTime time.Time
+var Umask fs.FileMode
 
 func init() {
 	NormalizedDateTime = time.Date(1980, time.January, 1, 0, 0, 1, 0, time.UTC)
@@ -172,6 +174,9 @@ func WriteDirToTar(tw TarWriter, srcDir, basePath string, uid, gid int, mode int
 			Name:     basePath,
 			Mode:     mode,
 		}
+		if rootHeader.Mode == -1 {
+			rootHeader.Mode = int64(fs.ModePerm &^ Umask)
+		}
 		finalizeHeader(rootHeader, uid, gid, mode, normalizeModTime)
 		if err := tw.WriteHeader(rootHeader); err != nil {
 			return err

diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go
@@ -2,6 +2,7 @@ package archive_test
 
 import (
 	"archive/tar"
+	"io/fs"
 	"math/rand"
 	"net"
 	"os"
@@ -246,7 +247,7 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
 
 				tw := tar.NewWriter(fh)
 
-				err = archive.WriteDirToTar(tw, src, "/nested/dir/dir-in-archive", 1234, 2345, -1, true, false, nil)
+				err = archive.WriteDirToTar(tw, src, "/nested/dir/dir-in-archive", 1234, 2345, -1, true, true, nil)
 				h.AssertNil(t, err)
 				h.AssertNil(t, tw.Close())
 				h.AssertNil(t, fh.Close())
@@ -258,6 +259,7 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
 				tr := tar.NewReader(file)
 
 				verify := h.NewTarVerifier(t, tr, 1234, 2345)
+				verify.NextDirectory("/nested/dir/dir-in-archive", int64(fs.ModePerm&^archive.Umask))
 				verify.NextFile("/nested/dir/dir-in-archive/some-file.txt", "some-content", fileMode(t, filepath.Join(src, "some-file.txt")))
 				verify.NextDirectory("/nested/dir/dir-in-archive/sub-dir", fileMode(t, filepath.Join(src, "sub-dir")))
 				if runtime.GOOS != "windows" {

diff --git a/pkg/archive/umask_unix.go b/pkg/archive/umask_unix.go
@@ -0,0 +1,13 @@
+//go:build unix
+
+package archive
+
+import (
+	"io/fs"
+	"syscall"
+)
+
+func init() {
+	Umask = fs.FileMode(syscall.Umask(0))
+	syscall.Umask(int(Umask))
+}