Merge pull request #6429 from nalind/ignore-user-overlay

copier: ignore user.overlay.* xattrs

Author: openshift-merge-bot[bot]

copier/xattrs.go

@@ -21,6 +21,7 @@ const (
 
 var (
 	relevantAttributes    = []string{"security.capability", imaXattr, "user.*"} // the attributes that we preserve - we discard others
+	irrelevantAttributes  = []string{"user.overlay.*"}                          // the attributes that we discard, even from the relevantAttributes list
 	initialXattrListSize  = 64 * 1024
 	initialXattrValueSize = 64 * 1024
 )
@@ -33,6 +34,13 @@ func isRelevantXattr(attribute string) bool {
 		if err != nil || !matched {
 			continue
 		}
+		for _, irrelevant := range irrelevantAttributes {
+			matched, err := filepath.Match(irrelevant, attribute)
+			if err != nil || !matched {
+				continue
+			}
+			return false
+		}
 		return true
 	}
 	return false

copier/xattrs_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func init() {
@@ -18,6 +19,30 @@ func init() {
 	initialXattrValueSize = 1
 }
 
+func TestXattrIsRelevant(t *testing.T) {
+	cases := []struct {
+		xattrName string
+		relevant  bool
+	}{
+		{"user.a", true},
+		{"user.b", true},
+		{"security.foo", false},
+		{imaXattr, true},
+		{"security.capability", true},
+		{"user.overlay.base", false},
+	}
+	for _, c := range cases {
+		t.Run(c.xattrName, func(t *testing.T) {
+			relevant := isRelevantXattr(c.xattrName)
+			if c.relevant {
+				require.True(t, relevant, "should be considered relevant and kept")
+			} else {
+				require.False(t, relevant, "should be considered irrelevant and discarded")
+			}
+		})
+	}
+}
+
 func TestXattrs(t *testing.T) {
 	t.Parallel()
 	if !xattrsSupported {