fix: path resolution for outside dirs to throw in miro test

This commit is contained in:
2026-03-21 08:57:17 +00:00
parent d56e9f3204
commit 4007a7d73e
3 changed files with 38 additions and 9 deletions
+24 -6
View File
@@ -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 {
+13
View File
@@ -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")