From 4007a7d73e136718353b905e152f9dcbff42b26c Mon Sep 17 00:00:00 2001 From: ruinivist Date: Sat, 21 Mar 2026 08:57:17 +0000 Subject: [PATCH] fix: path resolution for outside dirs to throw in miro test --- cmd/test.go | 4 +--- internal/miro/path_resolution.go | 30 +++++++++++++++++++++------ internal/miro/path_resolution_test.go | 13 ++++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/cmd/test.go b/cmd/test.go index 78c04a2..ee53905 100644 --- a/cmd/test.go +++ b/cmd/test.go @@ -1,8 +1,6 @@ package cmd import ( - "path/filepath" - "miro/internal/miro" "github.com/spf13/cobra" @@ -15,7 +13,7 @@ func newTestCommand() *cobra.Command { RunE: func(_ *cobra.Command, args []string) error { path := "" if len(args) == 1 { - path = filepath.Clean(args[0]) + path = args[0] } return miro.RunTests(path) diff --git a/internal/miro/path_resolution.go b/internal/miro/path_resolution.go index d932973..54ec28d 100644 --- a/internal/miro/path_resolution.go +++ b/internal/miro/path_resolution.go @@ -17,21 +17,39 @@ func resolvePathWithinTestDir(testDir, path, pathType string) (string, error) { return "", fmt.Errorf("failed to resolve test directory path: %v", err) } + ensureWithinTestDir := func(candidate string) (string, bool) { + relToTestDir, relErr := filepath.Rel(absTestDir, candidate) + if relErr != nil || !isWithinBase(relToTestDir) { + return "", false + } + + return candidate, true + } + + if filepath.IsAbs(path) { + absPath := filepath.Clean(path) + if candidate, ok := ensureWithinTestDir(absPath); ok { + return candidate, nil + } + + return "", fmt.Errorf("%s path %q must be inside test directory %q", pathType, path, absTestDir) + } + absPath, err := filepath.Abs(path) if err != nil { return "", fmt.Errorf("failed to resolve %s path: %v", pathType, err) } - relToTestDir, err := filepath.Rel(absTestDir, absPath) - if err == nil && isWithinBase(relToTestDir) { - return filepath.Join(absTestDir, relToTestDir), nil + if candidate, ok := ensureWithinTestDir(absPath); ok { + return candidate, nil } - if filepath.IsAbs(path) { - return "", fmt.Errorf("%s path %q must be inside test directory %q", pathType, path, absTestDir) + candidate := filepath.Clean(filepath.Join(absTestDir, path)) + if candidate, ok := ensureWithinTestDir(candidate); ok { + return candidate, nil } - return filepath.Join(absTestDir, path), nil + return "", fmt.Errorf("%s path %q must be inside test directory %q", pathType, path, absTestDir) } func isWithinBase(rel string) bool { diff --git a/internal/miro/path_resolution_test.go b/internal/miro/path_resolution_test.go index c352e61..23ab9b7 100644 --- a/internal/miro/path_resolution_test.go +++ b/internal/miro/path_resolution_test.go @@ -73,6 +73,19 @@ func TestResolvePathWithinTestDirRejectsAbsolutePathOutsideTestDir(t *testing.T) } } +func TestResolvePathWithinTestDirRejectsRelativePathOutsideTestDir(t *testing.T) { + root := t.TempDir() + testDir := filepath.Join(root, "e2e") + + _, err := resolvePathWithinTestDir(testDir, filepath.Join("..", "outside"), "record") + if err == nil { + t.Fatal("resolvePathWithinTestDir() error = nil, want error") + } + if !strings.Contains(err.Error(), "must be inside test directory") { + t.Fatalf("resolvePathWithinTestDir() error = %q, want inside test directory error", err.Error()) + } +} + func TestResolvePathWithinTestDirAllowsPathCurrentDirectory(t *testing.T) { root := t.TempDir() testDir := filepath.Join(root, "e2e")