kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #42016 from thaJeztah/archive_permissions

Browse source 
pkg/archive: Unpack() use 0755 permissions for missing directories
This commit is contained in:
Brian Goff 2021-02-17 09:35:51 -08:00 committed by GitHub
commit e403ab8833
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/archive/archive.go
View file

@ -956,7 +956,7 @@ loop:
parent := filepath.Dir(hdr.Name)
parentPath := filepath.Join(dest, parent)
if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {
err = idtools.MkdirAllAndChownNew(parentPath, 0777, rootIDs)
err = idtools.MkdirAllAndChownNew(parentPath, 0755, rootIDs)
if err != nil {
return err
}

19
pkg/archive/archive_unix_test.go
View file

@ -3,6 +3,7 @@
package archive // import "github.com/docker/docker/pkg/archive"
import (
"archive/tar"
"bytes"
"fmt"
"io/ioutil"
@ -156,6 +157,24 @@ func TestTarWithHardLinkAndRebase(t *testing.T) {
assert.Check(t, is.Equal(i1, i2))
}
// TestUntarParentPathPermissions is a regression test to check that missing
// parent directories are created with the expected permissions
func TestUntarParentPathPermissions(t *testing.T) {
buf := &bytes.Buffer{}
w := tar.NewWriter(buf)
err := w.WriteHeader(&tar.Header{Name: "foo/bar"})
assert.NilError(t, err)
tmpDir, err := ioutil.TempDir("", t.Name())
assert.NilError(t, err)
defer os.RemoveAll(tmpDir)
err = Untar(buf, tmpDir, nil)
assert.NilError(t, err)
fi, err := os.Lstat(filepath.Join(tmpDir, "foo"))
assert.NilError(t, err)
assert.Equal(t, fi.Mode(), 0755|os.ModeDir)
}
func getNlink(path string) (uint64, error) {
stat, err := os.Stat(path)
if err != nil {