fix(desktop): properly de-dupe and validate paths

Signed-off-by: Milas Bowman <[email protected]>

Author: milas

Diff for: internal/desktop/file_shares.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"path/filepath"
 	"strings"
 	"sync"
 
@@ -124,19 +123,13 @@ type FileShareManager struct {
 	state map[string]*FileShareSession
 }
 
-func NewFileShareManager(cli *Client, projectName string, hostPaths []string) (*FileShareManager, error) {
-	for _, p := range hostPaths {
-		if !filepath.IsAbs(p) {
-			return nil, fmt.Errorf("file share path is not absolute: %s", p)
-		}
-	}
-
+func NewFileShareManager(cli *Client, projectName string, hostPaths []string) *FileShareManager {
 	return &FileShareManager{
 		cli:         cli,
 		projectName: projectName,
 		hostPaths:   hostPaths,
 		state:       make(map[string]*FileShareSession),
-	}, nil
+	}
 }
 
 // EnsureExists looks for existing File Shares or creates new ones for the

Diff for: internal/paths/paths.go

@@ -76,3 +76,45 @@ func IsChild(dir string, file string) bool {
 		current = cDir
 	}
 }
+
+// EncompassingPaths returns the minimal set of paths that root all paths
+// from the original collection.
+//
+// For example, ["/foo", "/foo/bar", "/foo", "/baz"] -> ["/foo", "/baz].
+func EncompassingPaths(paths []string) []string {
+	result := []string{}
+	for _, current := range paths {
+		isCovered := false
+		hasRemovals := false
+
+		for i, existing := range result {
+			if IsChild(existing, current) {
+				// The path is already covered, so there's no need to include it
+				isCovered = true
+				break
+			}
+
+			if IsChild(current, existing) {
+				// Mark the element empty for removal.
+				result[i] = ""
+				hasRemovals = true
+			}
+		}
+
+		if !isCovered {
+			result = append(result, current)
+		}
+
+		if hasRemovals {
+			// Remove all the empties
+			newResult := []string{}
+			for _, r := range result {
+				if r != "" {
+					newResult = append(newResult, r)
+				}
+			}
+			result = newResult
+		}
+	}
+	return result
+}

Diff for: pkg/compose/create.go

@@ -22,13 +22,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
+	"sort"
 	"strconv"
 	"strings"
 
 	"github.com/docker/compose/v2/internal/desktop"
+	pathutil "github.com/docker/compose/v2/internal/paths"
 	moby "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/blkiodev"
 	"github.com/docker/docker/api/types/container"
@@ -161,13 +164,27 @@ func (s *composeService) ensureProjectVolumes(ctx context.Context, project *type
 				if vol.Type != string(mount.TypeBind) {
 					continue
 				}
-				paths = append(paths, vol.Source)
+				p := filepath.Clean(vol.Source)
+				if !filepath.IsAbs(p) {
+					return fmt.Errorf("file share path is not absolute: %s", p)
+				}
+				if _, err := os.Stat(p); errors.Is(err, fs.ErrNotExist) {
+					if vol.Bind != nil && !vol.Bind.CreateHostPath {
+						return fmt.Errorf("service %s: host path %q does not exist and `create_host_path` is false", svcName, vol.Source)
+					}
+					if err := os.MkdirAll(p, 0o755); err != nil {
+						return fmt.Errorf("creating host path: %w", err)
+					}
+				}
+				paths = append(paths, p)
 			}
 		}
-		fileShareManager, err := desktop.NewFileShareManager(s.desktopCli, project.Name, paths)
-		if err != nil {
-			return fmt.Errorf("creating file share manager: %w", err)
-		}
+
+		// remove duplicate/unnecessary child paths and sort them for predictability
+		paths = pathutil.EncompassingPaths(paths)
+		sort.Strings(paths)
+
+		fileShareManager := desktop.NewFileShareManager(s.desktopCli, project.Name, paths)
 		if err := fileShareManager.EnsureExists(ctx); err != nil {
 			return fmt.Errorf("initializing file shares: %w", err)
 		}

Diff for: pkg/watch/paths.go

@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-
-	pathutil "github.com/docker/compose/v2/internal/paths"
 )
 
 func greatestExistingAncestor(path string) (string, error) {
@@ -41,43 +39,3 @@ func greatestExistingAncestor(path string) (string, error) {
 
 	return path, nil
 }
-
-// If we're recursively watching a path, it doesn't
-// make sense to watch any of its descendants.
-func dedupePathsForRecursiveWatcher(paths []string) []string {
-	result := []string{}
-	for _, current := range paths {
-		isCovered := false
-		hasRemovals := false
-
-		for i, existing := range result {
-			if pathutil.IsChild(existing, current) {
-				// The path is already covered, so there's no need to include it
-				isCovered = true
-				break
-			}
-
-			if pathutil.IsChild(current, existing) {
-				// Mark the element empty for removal.
-				result[i] = ""
-				hasRemovals = true
-			}
-		}
-
-		if !isCovered {
-			result = append(result, current)
-		}
-
-		if hasRemovals {
-			// Remove all the empties
-			newResult := []string{}
-			for _, r := range result {
-				if r != "" {
-					newResult = append(newResult, r)
-				}
-			}
-			result = newResult
-		}
-	}
-	return result
-}

Diff for: pkg/watch/watcher_darwin.go

@@ -25,6 +25,7 @@ import (
 	"path/filepath"
 	"time"
 
+	pathutil "github.com/docker/compose/v2/internal/paths"
 	"github.com/fsnotify/fsevents"
 	"github.com/sirupsen/logrus"
 )
@@ -132,7 +133,7 @@ func newWatcher(paths []string, ignore PathMatcher) (Notify, error) {
 		stop:   make(chan struct{}),
 	}
 
-	paths = dedupePathsForRecursiveWatcher(paths)
+	paths = pathutil.EncompassingPaths(paths)
 	for _, path := range paths {
 		path, err := filepath.Abs(path)
 		if err != nil {

Diff for: pkg/watch/watcher_naive.go

@@ -71,7 +71,7 @@ func (d *naiveNotify) Start() error {
 		return err
 	}
 	if d.isWatcherRecursive {
-		pathsToWatch = dedupePathsForRecursiveWatcher(pathsToWatch)
+		pathsToWatch = pathutil.EncompassingPaths(pathsToWatch)
 	}
 
 	for _, name := range pathsToWatch {
@@ -320,7 +320,7 @@ func newWatcher(paths []string, ignore PathMatcher) (Notify, error) {
 	wrappedEvents := make(chan FileEvent)
 	notifyList := make(map[string]bool, len(paths))
 	if isWatcherRecursive {
-		paths = dedupePathsForRecursiveWatcher(paths)
+		paths = pathutil.EncompassingPaths(paths)
 	}
 	for _, path := range paths {
 		path, err := filepath.Abs(path)