internal/mcp: avoid JSON nulls on the wire
Add a test that checks for JSON null on the wire, and fix two categories of bugs leading to null: 1. In many places, we could pass typed nil where we shouldn't have. Add an orZero helper to avoid typed nills. 2. When listing roots, we should avoid nil. Fixes golang/go#74105 Change-Id: I061420487dbfcbf9016cb94b39bd72270e871c0e Reviewed-on: https://go-review.googlesource.com/c/tools/+/682675 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:
parent
5ae2a9f222
commit
927070053a
1 changed files with 104 additions and 21 deletions
|
|
@ -40,8 +40,6 @@ func sayHi(ctx context.Context, ss *ServerSession, params *CallToolParamsFor[hiP
|
|||
func TestEndToEnd(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
var ct, st Transport = NewInMemoryTransports()
|
||||
// ct = NewLoggingTransport(ct, os.Stderr)
|
||||
// st = NewLoggingTransport(st, os.Stderr)
|
||||
|
||||
// Channels to check if notification callbacks happened.
|
||||
notificationChans := map[string]chan int{}
|
||||
|
|
@ -659,6 +657,7 @@ func TestCancellation(t *testing.T) {
|
|||
func TestMiddleware(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ct, st := NewInMemoryTransports()
|
||||
|
||||
s := NewServer("testServer", "v1.0.0", nil)
|
||||
ss, err := s.Connect(ctx, st)
|
||||
if err != nil {
|
||||
|
|
@ -743,6 +742,69 @@ R1 <roots/list
|
|||
}
|
||||
}
|
||||
|
||||
type safeBuffer struct {
|
||||
mu sync.Mutex
|
||||
buf bytes.Buffer
|
||||
}
|
||||
|
||||
func (b *safeBuffer) Write(data []byte) (int, error) {
|
||||
b.mu.Lock()
|
||||
defer b.mu.Unlock()
|
||||
return b.buf.Write(data)
|
||||
}
|
||||
|
||||
func (b *safeBuffer) Bytes() []byte {
|
||||
b.mu.Lock()
|
||||
defer b.mu.Unlock()
|
||||
return b.buf.Bytes()
|
||||
}
|
||||
|
||||
func TestNoJSONNull(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
var ct, st Transport = NewInMemoryTransports()
|
||||
|
||||
// Collect logs, to sanity check that we don't write JSON null anywhere.
|
||||
var logbuf safeBuffer
|
||||
ct = NewLoggingTransport(ct, &logbuf)
|
||||
|
||||
s := NewServer("testServer", "v1.0.0", nil)
|
||||
ss, err := s.Connect(ctx, st)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
c := NewClient("testClient", "v1.0.0", nil)
|
||||
cs, err := c.Connect(ctx, ct)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := cs.ListTools(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := cs.ListPrompts(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := cs.ListResources(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := cs.ListResourceTemplates(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := ss.ListRoots(ctx, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
cs.Close()
|
||||
ss.Wait()
|
||||
|
||||
logs := logbuf.Bytes()
|
||||
if i := bytes.Index(logs, []byte("null")); i >= 0 {
|
||||
start := max(i-20, 0)
|
||||
end := min(i+20, len(logs))
|
||||
t.Errorf("conformance violation: MCP logs contain JSON null: %s", "..."+string(logs[start:end])+"...")
|
||||
}
|
||||
}
|
||||
|
||||
// traceCalls creates a middleware function that prints the method before and after each call
|
||||
// with the given prefix.
|
||||
func traceCalls[S Session](w io.Writer, prefix string) Middleware[S] {
|
||||
|
|
|
|||
Loading…
Reference in a new issue