Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: git sync no longer fails on sockets or unreadable files outside the repo (#3561)
Kyle Mendell13186788907f
diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.goindex de4b3ea4f..8f9a76f9f 100644--- a/backend/pkg/projects/fs_util.go+++ b/backend/pkg/projects/fs_util.go@@ -354,6 +354,16 @@ func CopyDirectoryContents(srcDir, destDir string, skipUnreadable func(relPath sif d.Type()&os.ModeSymlink != 0 {return nil}+ if !d.Type().IsRegular() {+ // Sockets, FIFOs, and device nodes left behind by running containers+ // have no copyable content — reading one fails with ENXIO, not a+ // permission error (#3003). Record them like unreadable entries so a+ // later restore preserves rather than prunes them.+ if skipUnreadable != nil {+ skipUnreadable(relPath)+ }+ return nil+ }return copyRegularFileInternal(srcRoot, destRoot, relPath, d, skipUnreadable)})@@ -361,8 +371,8 @@ func CopyDirectoryContents(srcDir, destDir string, skipUnreadable func(relPath sfunc handleCopyWalkErrorInternal(srcDir, path string, d os.DirEntry, walkErr error, skipUnreadable func(relPath string)) error {// An unreadable subdirectory surfaces here as a permission error on the- // directory entry itself.- if skipUnreadable == nil || !errors.Is(walkErr, os.ErrPermission) {+ // directory entry itself; an entry deleted mid-walk surfaces as not-exist.+ if skipUnreadable == nil || (!errors.Is(walkErr, os.ErrPermission) && !errors.Is(walkErr, os.ErrNotExist)) {return walkErr}if relPath, relErr := filepath.Rel(srcDir, path); relErr == nil {@@ -382,7 +392,7 @@ func copyRegularFileInternal(srcRoot, destRoot *os.Root, relPath string, d os.Dicontent, err := srcRoot.ReadFile(relPath)if err != nil {- if skipUnreadable != nil && errors.Is(err, os.ErrPermission) {+ if skipUnreadable != nil && (errors.Is(err, os.ErrPermission) || errors.Is(err, os.ErrNotExist)) {skipUnreadable(relPath)return nil}@@ -412,7 +422,11 @@ func MirrorDirectoryContentsPreserving(srcDir, destDir string, preserve []stringif err := pruneDirectoryContentsInternal(srcDir, destDir, preserveSet); err != nil {return err}- return CopyDirectoryContents(srcDir, destDir, nil)+ // Tolerate unreadable source entries during the copy-over: a mirror runs+ // while promoting or restoring a live project directory, and failing+ // half-way leaves it in a mixed state — worse than leaving a stale copy of+ // one unreadable file (#3509, #3085).+ return CopyDirectoryContents(srcDir, destDir, func(string) {})}func pruneDirectoryContentsInternal(srcDir, destDir string, preserve map[string]struct{}) error {@@ -430,6 +444,13 @@ func pruneDirectoryContentsInternal(srcDir, destDir string, preserve map[string]return filepath.WalkDir(destDir, func(path string, d os.DirEntry, walkErr error) error {if walkErr != nil {+ // An unreadable destination subdirectory (e.g. foreign-owned+ // bind-mount data) cannot be pruned; leave it in place instead of+ // failing the whole mirror mid-restore (#3509, #3085). Entries that+ // vanished mid-walk need no pruning either.+ if errors.Is(walkErr, os.ErrPermission) || errors.Is(walkErr, os.ErrNotExist) {+ return keepUnprunableEntryInternal(d)+ }return walkErr}if path == destDir {@@ -443,10 +464,7 @@ func pruneDirectoryContentsInternal(srcDir, destDir string, preserve map[string]// Never delete a preserved entry.if _, ok := preserve[relPath]; ok {- if d.IsDir() {- return filepath.SkipDir- }- return nil+ return keepUnprunableEntryInternal(d)}srcInfo, err := srcRoot.Lstat(relPath)@@ -454,6 +472,11 @@ func pruneDirectoryContentsInternal(srcDir, destDir string, preserve map[string]return nil}if err != nil && !errors.Is(err, os.ErrNotExist) {+ // Cannot inspect the source counterpart — keep the destination+ // entry rather than deleting something the source may still have.+ if errors.Is(err, os.ErrPermission) {+ return keepUnprunableEntryInternal(d)+ }return err}@@ -474,6 +497,15 @@ func pruneDirectoryContentsInternal(srcDir, destDir string, preserve map[string]})}+// keepUnprunableEntryInternal continues a prune walk past an entry that must+// stay: descend no further into directories, ignore files.+func keepUnprunableEntryInternal(d os.DirEntry) error {+ if d != nil && d.IsDir() {+ return filepath.SkipDir+ }+ return nil+}+// hasPreservedDescendantInternal reports whether any preserved path lives under// dir, so the prune knows to descend into dir rather than remove it wholesale.func hasPreservedDescendantInternal(dir string, preserve map[string]struct{}) bool {diff --git a/backend/pkg/projects/fs_util_unix_test.go b/backend/pkg/projects/fs_util_unix_test.goindex df2482211..005d9f8be 100644--- a/backend/pkg/projects/fs_util_unix_test.go+++ b/backend/pkg/projects/fs_util_unix_test.go@@ -113,3 +113,47 @@ func TestMirrorDirectoryContentsPreserving_KeepsSkippedFile(t *testing.T) {// The straggler created during the failed update is pruned.assert.NoFileExists(t, filepath.Join(live, "straggler.txt"))}++func TestCopyDirectoryContentsTolerant_SkipsNonRegularFiles(t *testing.T) {+ src := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(src, "compose.yaml"), []byte("services: {}\n"), 0o644))+ require.NoError(t, os.MkdirAll(filepath.Join(src, "config"), 0o755))+ // A FIFO stands in for the sockets running containers leave behind+ // (e.g. config/.XDG/wayland-0 in #3003); reading either fails with a+ // non-permission error.+ require.NoError(t, syscall.Mkfifo(filepath.Join(src, "config", "app.sock"), 0o644))++ dst := t.TempDir()+ skipped, err := CopyDirectoryContentsTolerant(src, dst)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join("config", "app.sock")}, skipped)+ assert.FileExists(t, filepath.Join(dst, "compose.yaml"))+ assert.NoFileExists(t, filepath.Join(dst, "config", "app.sock"))+}++func TestMirrorDirectoryContentsPreserving_ToleratesUnreadableDestSubdir(t *testing.T) {+ if os.Geteuid() == 0 {+ t.Skip("running as root; permission bits are not enforced")+ }++ dst := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(dst, "compose.yaml"), []byte("old\n"), 0o644))+ locked := filepath.Join(dst, "volumes")+ require.NoError(t, os.MkdirAll(filepath.Join(locked, "config"), 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(locked, "config", "app.conf"), []byte("keep"), 0o644))+ require.NoError(t, os.Chmod(locked, 0o000))+ t.Cleanup(func() { _ = os.Chmod(locked, 0o755) })++ src := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(src, "compose.yaml"), []byte("new\n"), 0o644))++ // The unreadable live-project subdir must be left intact instead of+ // failing the whole mirror (#3509, #3085).+ require.NoError(t, MirrorDirectoryContentsPreserving(src, dst, []string{"volumes"}))++ content, err := os.ReadFile(filepath.Join(dst, "compose.yaml"))+ require.NoError(t, err)+ assert.Equal(t, "new\n", string(content))+ require.NoError(t, os.Chmod(locked, 0o755))+ assert.FileExists(t, filepath.Join(locked, "config", "app.conf"))+}