Skip to content

Fix test failures on macOS by resolving symlinks in allowed directories #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged

Fix test failures on macOS by resolving symlinks in allowed directories #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions filesystemserver/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestReadfile_Valid(t *testing.T) {
err := os.WriteFile(filepath.Join(dir, "test"), []byte(content), 0644)
require.NoError(t, err)

handler, err := NewFilesystemHandler([]string{dir})
handler, err := NewFilesystemHandler(resolveAllowedDirs(t, dir))
require.NoError(t, err)
request := mcp.CallToolRequest{}
request.Params.Name = "read_file"
Expand All @@ -35,7 +35,7 @@ func TestReadfile_Valid(t *testing.T) {

func TestReadfile_Invalid(t *testing.T) {
dir := t.TempDir()
handler, err := NewFilesystemHandler([]string{dir})
handler, err := NewFilesystemHandler(resolveAllowedDirs(t, dir))
require.NoError(t, err)

request := mcp.CallToolRequest{}
Expand All @@ -54,7 +54,7 @@ func TestReadfile_NoAccess(t *testing.T) {
dir1 := t.TempDir()
dir2 := t.TempDir()

handler, err := NewFilesystemHandler([]string{dir1})
handler, err := NewFilesystemHandler(resolveAllowedDirs(t, dir1))
require.NoError(t, err)

request := mcp.CallToolRequest{}
Expand Down Expand Up @@ -100,7 +100,7 @@ func TestSearchFiles_Pattern(t *testing.T) {
err = os.WriteFile(foo_test_c, []byte("foo"), 0644)
require.NoError(t, err)

handler, err := NewFilesystemHandler([]string{dir})
handler, err := NewFilesystemHandler(resolveAllowedDirs(t, dir))
require.NoError(t, err)

tests := []struct {
Expand Down Expand Up @@ -133,3 +133,22 @@ func TestSearchFiles_Pattern(t *testing.T) {
})
}
}

// resolveAllowedDirs generates a list of allowed paths, including their resolved symlinks.
// This ensures both the original paths and their symlink-resolved counterparts are included,
// which is useful when paths may be symlinks (e.g., t.TempDir() on some Unix systems).
func resolveAllowedDirs(t *testing.T, dirs ...string) []string {
t.Helper()
allowedDirs := make([]string, 0)
for _, dir := range dirs {
allowedDirs = append(allowedDirs, dir)

resolvedPath, err := filepath.EvalSymlinks(dir)
require.NoError(t, err, "Failed to resolve symlinks for directory: %s", dir)

if resolvedPath != dir {
allowedDirs = append(allowedDirs, resolvedPath)
}
}
return allowedDirs
}