diff --git a/internal/skillserve/server.go b/internal/skillserve/server.go index 06e027de9..5efe2ce1f 100644 --- a/internal/skillserve/server.go +++ b/internal/skillserve/server.go @@ -100,9 +100,13 @@ func NewServer(b *Builder, opts Options) (*mcp.Server, error) { } // HTTPHandler serves srv over Streamable HTTP. A non-empty token must be sent -// as a bearer token on every request. +// as a bearer token on every request. Cross-origin browser requests are +// refused, so a web page cannot reach a loopback server that has no token. func HTTPHandler(srv *mcp.Server, token string) http.Handler { - h := mcp.NewStreamableHTTPHandler(func(*http.Request) *mcp.Server { return srv }, &mcp.StreamableHTTPOptions{Stateless: true}) + h := mcp.NewStreamableHTTPHandler(func(*http.Request) *mcp.Server { return srv }, &mcp.StreamableHTTPOptions{ + Stateless: true, + CrossOriginProtection: http.NewCrossOriginProtection(), + }) if token == "" { return h } diff --git a/internal/skillserve/server_test.go b/internal/skillserve/server_test.go index 07eda4cab..4224a676a 100644 --- a/internal/skillserve/server_test.go +++ b/internal/skillserve/server_test.go @@ -141,6 +141,22 @@ func TestHTTPHandler_RequiresBearerToken(t *testing.T) { } } +// A web page in the browser must not reach a loopback server that has no token. +func TestHTTPHandler_RejectsCrossOriginBrowserRequests(t *testing.T) { + srv, err := NewServer(&Builder{Source: t.TempDir()}, Options{}) + if err != nil { + t.Fatal(err) + } + req := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8765/", strings.NewReader(`{}`)) + req.Header.Set("Origin", "https://evil.example") + req.Header.Set("Sec-Fetch-Site", "cross-site") + rec := httptest.NewRecorder() + HTTPHandler(srv, "").ServeHTTP(rec, req) + if rec.Code != http.StatusForbidden { + t.Errorf("cross-origin request: status %d, want 403", rec.Code) + } +} + func TestServer_SeesNewSkillWithoutRestart(t *testing.T) { src := t.TempDir() cs := connect(t, src)