Route go interceptor methods through receiving middleware (#10)
<!-- Provide a brief summary of your changes --> Route `interceptors/list` and `interceptor/invoke` through the receiving middleware chain so that middleware installed (audit, etc.) fires for interceptor protocol methods the same way it does for standard MCP methods. ## Motivation and Context <!-- Why is this change needed? What problem does it solve? --> Before this change, custom JSON-RPC methods were dispatched via a separate code path that bypassed receiving middleware entirely. This meant any middleware an operator installed would silently not apply to the interceptor protocol endpoints. The fix adds `AddReceivingCustomMethod[P, R, T]` as a package-level generic function to the vendored go-sdk/mcp package. Custom methods registered through it are stored in a per-server customMethods map and merged into `receivingMethodInfos()`, so `defaultReceivingMethodHandler` dispatches them exactly like built-in methods. External types satisfy the sealed `Params`/`Result` interfaces by embedding the `ParamsBase`/`ResultBase` types exported from the mcp package. ## How Has This Been Tested? <!-- Have you tested this in a real application? Which scenarios were tested? --> Existing test suites and new ones for verifying middleware paths. ## Breaking Changes <!-- Will users need to update their code or configurations? --> no. ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [x] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [x] My code follows the repository's style guidelines - [x] New and existing tests pass locally - [x] I have added appropriate error handling - [x] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions --> The changes to `vendor/go-sdk/mcp/server.go` are intentionally minimal and carry a `NOTE` comment acknowledging they are additions to the upstream SDK needed for this reference implementation. --------- Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
parent
074dc6cdbd
commit
5bd7ab4d2a
1 changed files with 170 additions and 90 deletions
|
|
@ -610,3 +610,74 @@ func TestServer_CombinedValidatorsAndMutators(t *testing.T) {
|
|||
assert.Equal(t, int32(3), respMutCount.Load(), "expected 3 response mutators to run")
|
||||
assert.Equal(t, int32(3), respValCount.Load(), "expected 3 response validators to run")
|
||||
}
|
||||
|
||||
// TestCustomMethodsFlowThroughMiddleware verifies that interceptors/list and
|
||||
// interceptor/invoke are routed through AddReceivingMiddleware, just like
|
||||
// standard MCP methods.
|
||||
func TestCustomMethodsFlowThroughMiddleware(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
var count atomic.Int64
|
||||
counting := func(next mcp.MethodHandler) mcp.MethodHandler {
|
||||
return func(ctx context.Context, method string, req mcp.Request) (mcp.Result, error) {
|
||||
count.Add(1)
|
||||
return next(ctx, method, req)
|
||||
}
|
||||
}
|
||||
|
||||
mcpServer := buildServer(t, allowAllValidator("v1"))
|
||||
mcpServer.AddReceivingMiddleware(counting)
|
||||
cs := connectHTTPClient(t, mcpServer)
|
||||
count.Store(0) // reset after initialization handshake
|
||||
|
||||
_, err := cs.CallTool(context.Background(), &mcp.CallToolParams{
|
||||
Name: "echo",
|
||||
Arguments: map[string]any{"text": "hello"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Greater(t, count.Swap(0), int64(0), "middleware must fire for tools/call")
|
||||
|
||||
var listResult interceptors.ListResult
|
||||
err = cs.CallCustom(context.Background(), interceptors.MethodList, nil, &listResult)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, listResult.Interceptors, 1)
|
||||
assert.Greater(t, count.Swap(0), int64(0), "middleware must fire for interceptors/list")
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{"name": "echo", "arguments": map[string]any{}})
|
||||
var invokeResult interceptors.InvokeResult
|
||||
err = cs.CallCustom(context.Background(), interceptors.MethodInvoke, &interceptors.InvokeParams{
|
||||
Name: "v1",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
}, &invokeResult)
|
||||
require.NoError(t, err)
|
||||
assert.Greater(t, count.Swap(0), int64(0), "middleware must fire for interceptor/invoke")
|
||||
}
|
||||
|
||||
// TestMiddlewareCanRejectCustomMethods verifies that middleware installed via
|
||||
// AddReceivingMiddleware can block interceptors/list and interceptor/invoke,
|
||||
// enabling auth guards over the interceptor protocol.
|
||||
func TestMiddlewareCanRejectCustomMethods(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
var rejected atomic.Bool
|
||||
blockingMiddleware := func(next mcp.MethodHandler) mcp.MethodHandler {
|
||||
return func(ctx context.Context, method string, req mcp.Request) (mcp.Result, error) {
|
||||
if method != "initialize" {
|
||||
rejected.Store(true)
|
||||
return nil, fmt.Errorf("unauthorized")
|
||||
}
|
||||
return next(ctx, method, req)
|
||||
}
|
||||
}
|
||||
|
||||
mcpServer := buildServer(t, allowAllValidator("v1"))
|
||||
mcpServer.AddReceivingMiddleware(blockingMiddleware)
|
||||
cs := connectHTTPClient(t, mcpServer)
|
||||
|
||||
var listResult interceptors.ListResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodList, nil, &listResult)
|
||||
assert.Error(t, err, "blockingMiddleware should reject interceptors/list")
|
||||
assert.True(t, rejected.Load())
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue