Merge pull request #2954 from thaJeztah/1.1_backport_fix_xattr

estesp · web-flow · commit 813e5f67655e · 2019-01-24T08:19:29.000-05:00
[release/1.1 backport] fix: SCHILY.xattrs should be SCHILY.xattr
diff --git a/archive/tar.go b/archive/tar.go
@@ -100,7 +100,7 @@ const (
 	// readdir calls to this directory do not follow to lower layers.
 	whiteoutOpaqueDir = whiteoutMetaPrefix + ".opq"
 
-	paxSchilyXattr = "SCHILY.xattrs."
+	paxSchilyXattr = "SCHILY.xattr."
 )
 
 // Apply applies a tar stream of an OCI style diff tar.
diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -22,6 +22,7 @@ import (
 	"archive/tar"
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
@@ -32,6 +33,7 @@ import (
 
 	_ "crypto/sha256"
 
+	"github.com/containerd/containerd/testutil"
 	"github.com/containerd/continuity/fs"
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/pkg/errors"
@@ -182,6 +184,50 @@ func TestSymlinks(t *testing.T) {
 	}
 }
 
+func TestTarWithXattr(t *testing.T) {
+	testutil.RequiresRoot(t)
+
+	fileXattrExist := func(f1, xattrKey, xattrValue string) func(string) error {
+		return func(root string) error {
+			values, err := getxattr(filepath.Join(root, f1), xattrKey)
+			if err != nil {
+				return err
+			}
+			if xattrValue != string(values) {
+				return fmt.Errorf("file xattrs expect to be %s, actually get %s", xattrValue, values)
+			}
+			return nil
+		}
+	}
+
+	tests := []struct {
+		name  string
+		key   string
+		value string
+		err   error
+	}{
+		{
+			name:  "WithXattrsUser",
+			key:   "user.key",
+			value: "value",
+		},
+		{
+			// security related xattrs need root permission to test
+			name:  "WithXattrSelinux",
+			key:   "security.selinux",
+			value: "unconfined_u:object_r:default_t:s0\x00",
+		},
+	}
+	for _, at := range tests {
+		tc := TarContext{}.WithUIDGID(os.Getuid(), os.Getgid()).WithModTime(time.Now().UTC()).WithXattrs(map[string]string{
+			at.key: at.value,
+		})
+		w := TarAll(tc.File("/file", []byte{}, 0755))
+		validator := fileXattrExist("file", at.key, at.value)
+		t.Run(at.name, makeWriterToTarTest(w, nil, validator, at.err))
+	}
+}
+
 func TestBreakouts(t *testing.T) {
 	tc := TarContext{}.WithUIDGID(os.Getuid(), os.Getgid()).WithModTime(time.Now().UTC())
 	expected := "unbroken"

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ const (`
`100`	`100`	`// readdir calls to this directory do not follow to lower layers.`
`101`	`101`	`whiteoutOpaqueDir = whiteoutMetaPrefix + ".opq"`
`102`	`102`
`103`		`- paxSchilyXattr = "SCHILY.xattrs."`
	`103`	`+ paxSchilyXattr = "SCHILY.xattr."`
`104`	`104`	`)`
`105`	`105`
`106`	`106`	`// Apply applies a tar stream of an OCI style diff tar.`