internal/mcp: add the FileResourceHandler method

Provide secure reading of files on the local filesystem.

There are subtleties in path manipulation on Windows that I don't fully
understand, so I defer that work for now.

Change-Id: Ic11f4617dde4ac0b31ccd5b0a772bb2f56db026f
Reviewed-on: https://go-review.googlesource.com/c/tools/+/673196
Reviewed-by: Robert Findley <rfindley@google.com>
Reviewed-by: Sam Thanawalla <samthanawalla@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Jonathan Amsterdam 2025-05-13 15:38:08 -04:00
commit 8361df724d

View file

@ -9,6 +9,8 @@ import (
"context"
"errors"
"fmt"
"path/filepath"
"runtime"
"slices"
"strings"
"sync"
@ -83,7 +85,11 @@ func TestEndToEnd(t *testing.T) {
}()
c := NewClient("testClient", "v1.0.0", nil)
c.AddRoots(&Root{URI: "file:///root"})
rootAbs, err := filepath.Abs(filepath.FromSlash("testdata/files"))
if err != nil {
t.Fatal(err)
}
c.AddRoots(&Root{URI: "file://" + rootAbs})
// Connect the client.
cs, err := c.Connect(ctx, ct)
@ -189,10 +195,13 @@ func TestEndToEnd(t *testing.T) {
})
t.Run("resources", func(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("TODO: fix for Windows")
}
resource1 := &Resource{
Name: "public",
MIMEType: "text/plain",
URI: "file:///file1.txt",
URI: "file:///info.txt",
}
resource2 := &Resource{
Name: "public", // names are not unique IDs
@ -200,16 +209,7 @@ func TestEndToEnd(t *testing.T) {
URI: "file:///nonexistent.txt",
}
readHandler := func(_ context.Context, _ *ServerSession, p *ReadResourceParams) (*ReadResourceResult, error) {
if p.URI == "file:///file1.txt" {
return &ReadResourceResult{
Contents: &ResourceContents{
Text: "file contents",
},
}, nil
}
return nil, ResourceNotFoundError(p.URI)
}
readHandler := s.FileResourceHandler("testdata/files")
s.AddResources(
&ServerResource{resource1, readHandler},
&ServerResource{resource2, readHandler})
@ -226,7 +226,7 @@ func TestEndToEnd(t *testing.T) {
uri string
mimeType string // "": not found; "text/plain": resource; "text/template": template
}{
{"file:///file1.txt", "text/plain"},
{"file:///info.txt", "text/plain"},
{"file:///nonexistent.txt", ""},
// TODO(jba): add resource template cases when we implement them
} {
@ -238,7 +238,7 @@ func TestEndToEnd(t *testing.T) {
t.Errorf("%s: not found but expected it to be", tt.uri)
}
} else {
t.Fatalf("reading %s: %v", tt.uri, err)
t.Errorf("reading %s: %v", tt.uri, err)
}
} else {
if got := rres.Contents.URI; got != tt.uri {