containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dump: handle duplicates 

Add validation for duplicate entries.  Duplicates are ignored, unless
there is a mismatch in the values.  In that case, an error is returned.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-06-05 13:59:11 +02:00
parent 588dd2767c
commit 1848835383
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
2 changed files with 75 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/chunked/dump/dump.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"io"
"path/filepath"
"reflect"
"strings"
"time"
@ -109,7 +110,7 @@ func sanitizeName(name string) string {
return path
}
func dumpNode(out io.Writer, added map[string]struct{}, links map[string]int, verityDigests map[string]string, entry *internal.FileMetadata) error {
func dumpNode(out io.Writer, added map[string]*internal.FileMetadata, links map[string]int, verityDigests map[string]string, entry *internal.FileMetadata) error {
path := sanitizeName(entry.Name)
parent := filepath.Dir(path)
@ -124,7 +125,14 @@ func dumpNode(out io.Writer, added map[string]struct{}, links map[string]int, ve
}
}
added[path] = struct{}{}
if e, found := added[path]; found {
// if the entry was already added, make sure it has the same data
if !reflect.DeepEqual(*e, *entry) {
return fmt.Errorf("entry %q already added with different data", path)
}
return nil
}
added[path] = entry
if _, err := fmt.Fprint(out, escaped(path, ESCAPE_STANDARD)); err != nil {
return err
@ -220,7 +228,7 @@ func GenerateDump(tocI interface{}, verityDigests map[string]string) (io.Reader,
}()
links := make(map[string]int)
added := make(map[string]struct{})
added := make(map[string]*internal.FileMetadata)
for _, e := range toc.Entries {
if e.Linkname == "" {
continue

76
pkg/chunked/dump/dump_test.go
View File

@ -66,6 +66,14 @@ func TestDumpNode(t *testing.T) {
Name: "./",
Type: internal.TypeDir,
ModTime: &modTime,
UID: 0,
}
rootEntry2 := &internal.FileMetadata{
Name: "./",
Type: internal.TypeDir,
ModTime: &modTime,
UID: 101,
}
directoryEntry := &internal.FileMetadata{
@ -101,16 +109,38 @@ func TestDumpNode(t *testing.T) {
}
testCases := []struct {
name string
entries []*internal.FileMetadata
expected string
name string
entries []*internal.FileMetadata
expected string
skipAddingRootEntry bool
expectError bool
}{
{
name: "root entry",
entries: []*internal.FileMetadata{
rootEntry,
},
expected: "/ 0 40000 1 0 0 0 1672531200.0 - - -\n",
expected: "/ 0 40000 1 0 0 0 1672531200.0 - - -\n",
skipAddingRootEntry: true,
},
{
name: "duplicate root entry",
entries: []*internal.FileMetadata{
rootEntry,
rootEntry,
rootEntry,
},
expected: "/ 0 40000 1 0 0 0 1672531200.0 - - -\n",
skipAddingRootEntry: true,
},
{
name: "duplicate root entry with mismatch",
entries: []*internal.FileMetadata{
rootEntry,
rootEntry2,
},
skipAddingRootEntry: true,
expectError: true,
},
{
name: "regular file",
@ -119,6 +149,15 @@ func TestDumpNode(t *testing.T) {
},
expected: "/example.txt 100 100000 1 1000 1000 0 1672531200.0 ab/cdef1234567890 - - user.key1=value1\n",
},
{
name: "root entry with file",
entries: []*internal.FileMetadata{
rootEntry,
regularFileEntry,
},
expected: "/ 0 40000 1 0 0 0 1672531200.0 - - -\n/example.txt 100 100000 1 1000 1000 0 1672531200.0 ab/cdef1234567890 - - user.key1=value1\n",
skipAddingRootEntry: true,
},
{
name: "directory",
entries: []*internal.FileMetadata{
@ -147,7 +186,6 @@ func TestDumpNode(t *testing.T) {
},
expected: "/foo 0 40755 1 0 0 0 0.0 - - -\n/foo/bar 0 40755 1 0 0 0 0.0 - - -\n/foo/bar/baz 0 40755 1 0 0 0 0.0 - - -\n/foo/bar/baz/entry 0 100000 1 0 0 0 1672531200.0 - - -\n",
},
// Additional test cases
{
name: "complex case",
entries: []*internal.FileMetadata{
@ -155,23 +193,37 @@ func TestDumpNode(t *testing.T) {
regularFileEntry,
directoryEntry,
},
expected: "/ 0 40000 1 0 0 0 1672531200.0 - - -\n/example.txt 100 100000 1 1000 1000 0 1672531200.0 ab/cdef1234567890 - - user.key1=value1\n/mydir 0 40000 1 1000 1000 0 1672531200.0 - - - user.key2=value2\n",
expected: "/ 0 40000 1 0 0 0 1672531200.0 - - -\n/example.txt 100 100000 1 1000 1000 0 1672531200.0 ab/cdef1234567890 - - user.key1=value1\n/mydir 0 40000 1 1000 1000 0 1672531200.0 - - - user.key2=value2\n",
skipAddingRootEntry: true,
},
}
added := map[string]struct{}{"/": {}}
for _, testCase := range testCases {
var buf bytes.Buffer
added := map[string]*internal.FileMetadata{}
if !testCase.skipAddingRootEntry {
added["/"] = rootEntry
}
var foundErr error
for _, entry := range testCase.entries {
err := dumpNode(&buf, added, map[string]int{}, map[string]string{}, entry)
if err != nil {
t.Errorf("unexpected error for %s: %v", testCase.name, err)
foundErr = err
}
}
actual := buf.String()
if actual != testCase.expected {
t.Errorf("for %s, got %q, want %q", testCase.name, actual, testCase.expected)
if testCase.expectError && foundErr == nil {
t.Errorf("expected error for %s, got nil", testCase.name)
}
if !testCase.expectError {
if foundErr != nil {
t.Errorf("unexpected error for %s: %v", testCase.name, foundErr)
}
actual := buf.String()
if actual != testCase.expected {
t.Errorf("for %s, got %q, want %q", testCase.name, actual, testCase.expected)
}
}
}
}