## Summary - Rename `interceptors/mcpserver/` → `interceptors/extension/`, replacing the `Server` wrapper with a lightweight `Extension` that can install itself on any `*mcp.Server` - Remove the stored `*mcp.Server` field — `Extension` is now a pure interceptor container with no server reference - Add `Install(server)` method to register JSON-RPC methods and init middleware on a given server - Update `LocalChain(ctx)` → `LocalChain(ctx, server)` to accept the server as a parameter - Remove `MCPServer()`, `Run()`, and `NewStreamableHTTPHandler()` wrapper methods — users interact with `mcp.Server` directly - Update all examples, tests, and documentation to use the new API ## Why `mcpserver.Server` pretended to *be* the server — it had `Run()`, `NewStreamableHTTPHandler()`, etc. — but it could never cover the full `*mcp.Server` API, so users constantly needed `MCPServer()` to unwrap it. `Extension` doesn't pretend to be the server. It's a pure interceptor container that can install itself on any server (or multiple servers) on the fly. No stored server reference, no wrapping, no delegation surface to maintain. ### Before ```go mcpServer := mcp.NewServer(...) srv := mcpserver.NewServer(mcpServer) srv.AddInterceptor(v) chain, err := srv.LocalChain(ctx) ``` ### After ```go mcpServer := mcp.NewServer(...) ext := extension.New() ext.AddInterceptor(v) ext.Install(mcpServer) chain, err := ext.LocalChain(ctx, mcpServer) ``` Signed-off-by: Kurt Degiorgio <kdegiorgio@bloomberg.net>
110 lines
3.3 KiB
Go
110 lines
3.3 KiB
Go
// Example: a simple validator interceptor that rejects tool calls
|
|
// to a tool named "dangerous_tool".
|
|
//
|
|
// Demonstrates WithContextProvider to populate Invocation.Context with
|
|
// caller identity, which interceptor handlers can inspect.
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log"
|
|
"net/http"
|
|
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
|
|
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors"
|
|
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors/extension"
|
|
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors/integrations/gomiddleware"
|
|
)
|
|
|
|
func main() {
|
|
mcpServer := mcp.NewServer(&mcp.Implementation{
|
|
Name: "example-server",
|
|
Version: "0.1.0",
|
|
}, nil)
|
|
|
|
mcpServer.AddTool(&mcp.Tool{Name: "echo", Description: "echoes input", InputSchema: map[string]any{"type": "object"}},
|
|
func(ctx context.Context, req *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
|
return &mcp.CallToolResult{
|
|
Content: []mcp.Content{&mcp.TextContent{Text: fmt.Sprintf("you said: %s", req.Params.Arguments)}},
|
|
}, nil
|
|
},
|
|
)
|
|
|
|
// Build the validator.
|
|
v := &interceptors.Validator{
|
|
Metadata: interceptors.Metadata{
|
|
Name: "block-dangerous-tool",
|
|
Hook: interceptors.Hook{
|
|
Events: []string{interceptors.EventToolsCall},
|
|
Phase: interceptors.PhaseRequest,
|
|
},
|
|
Mode: interceptors.ModeEnforce,
|
|
},
|
|
Handler: func(_ context.Context, inv *interceptors.Invocation) (*interceptors.ValidationResult, error) {
|
|
raw, ok := inv.Payload.(json.RawMessage)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected payload type %T", inv.Payload)
|
|
}
|
|
var params struct {
|
|
Name string `json:"name"`
|
|
}
|
|
if err := json.Unmarshal(raw, ¶ms); err != nil {
|
|
return nil, err
|
|
}
|
|
if params.Name == "dangerous_tool" {
|
|
reason := "dangerous_tool is not allowed"
|
|
if inv.Context != nil && inv.Context.Principal != nil {
|
|
reason = fmt.Sprintf("dangerous_tool is not allowed for %s", inv.Context.Principal.ID)
|
|
}
|
|
return &interceptors.ValidationResult{
|
|
Valid: false,
|
|
Messages: []interceptors.ValidationMessage{
|
|
{Message: reason, Severity: interceptors.SeverityError},
|
|
},
|
|
}, nil
|
|
}
|
|
return &interceptors.ValidationResult{Valid: true}, nil
|
|
},
|
|
}
|
|
|
|
// Create the interceptor extension (registers interceptors as discoverable
|
|
// resources via interceptors/list and interceptor/invoke).
|
|
ext := extension.New()
|
|
ext.AddInterceptor(v)
|
|
ext.Install(mcpServer)
|
|
|
|
// Create a chain connected via in-memory transport.
|
|
chain, err := ext.LocalChain(context.Background(), mcpServer)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
// Install middleware for automatic execution on every request/response.
|
|
// WithContextProvider populates caller identity for interceptor handlers.
|
|
mcpServer.AddReceivingMiddleware(
|
|
gomiddleware.Middleware(chain,
|
|
gomiddleware.WithContextProvider(
|
|
func(_ context.Context, _ mcp.Request) *interceptors.InvocationContext {
|
|
return &interceptors.InvocationContext{
|
|
Principal: &interceptors.Principal{
|
|
Type: "user",
|
|
ID: "example-user",
|
|
},
|
|
}
|
|
},
|
|
),
|
|
),
|
|
)
|
|
|
|
handler := mcp.NewStreamableHTTPHandler(
|
|
func(r *http.Request) *mcp.Server { return mcpServer },
|
|
nil,
|
|
)
|
|
log.Println("listening on :8080")
|
|
if err := http.ListenAndServe(":8080", handler); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|