mcp: add a max request body size of the old transport (#1224)
added for consistency with the streamable transport because sse is not officially deprecated in the SDK Co-authored-by: Guglielmo Colombo <guglielmoc@google.com>
This commit is contained in:
parent
2fdabde139
commit
cb0de64136
2 changed files with 80 additions and 1 deletions
32
mcp/sse.go
32
mcp/sse.go
|
|
@ -8,6 +8,7 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"mime"
|
"mime"
|
||||||
|
|
@ -65,6 +66,12 @@ type SSEOptions struct {
|
||||||
// Only disable this if you understand the security implications.
|
// Only disable this if you understand the security implications.
|
||||||
// See: https://modelcontextprotocol.io/specification/2025-11-25/basic/security_best_practices#local-mcp-server-compromise
|
// See: https://modelcontextprotocol.io/specification/2025-11-25/basic/security_best_practices#local-mcp-server-compromise
|
||||||
DisableLocalhostProtection bool
|
DisableLocalhostProtection bool
|
||||||
|
|
||||||
|
// MaxRequestBodyBytes limits the number of bytes read from an incoming
|
||||||
|
// POST body before the server responds with 413 Request Entity Too Large.
|
||||||
|
// It matches [StreamableHTTPOptions.MaxRequestBodyBytes]: if zero,
|
||||||
|
// [DefaultMaxRequestBodyBytes] is used; a negative value disables the limit.
|
||||||
|
MaxRequestBodyBytes int64
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewSSEHandler returns a new [SSEHandler] that creates and manages MCP
|
// NewSSEHandler returns a new [SSEHandler] that creates and manages MCP
|
||||||
|
|
@ -122,6 +129,12 @@ type SSEServerTransport struct {
|
||||||
// Response is the hanging response body to the incoming GET request.
|
// Response is the hanging response body to the incoming GET request.
|
||||||
Response http.ResponseWriter
|
Response http.ResponseWriter
|
||||||
|
|
||||||
|
// MaxRequestBodyBytes limits the number of bytes read from a POSTed
|
||||||
|
// message body before [SSEServerTransport.ServeHTTP] responds with 413
|
||||||
|
// Request Entity Too Large. If zero, [DefaultMaxRequestBodyBytes] is used;
|
||||||
|
// a negative value disables the limit. See [SSEOptions.MaxRequestBodyBytes].
|
||||||
|
MaxRequestBodyBytes int64
|
||||||
|
|
||||||
// incoming is the queue of incoming messages.
|
// incoming is the queue of incoming messages.
|
||||||
// It is never closed, and by convention, incoming is non-nil if and only if
|
// It is never closed, and by convention, incoming is non-nil if and only if
|
||||||
// the transport is connected.
|
// the transport is connected.
|
||||||
|
|
@ -143,9 +156,22 @@ func (t *SSEServerTransport) ServeHTTP(w http.ResponseWriter, req *http.Request)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
limit := t.MaxRequestBodyBytes
|
||||||
|
if limit == 0 {
|
||||||
|
limit = DefaultMaxRequestBodyBytes
|
||||||
|
}
|
||||||
|
if limit > 0 && req.Body != nil {
|
||||||
|
req.Body = http.MaxBytesReader(w, req.Body, limit)
|
||||||
|
}
|
||||||
|
|
||||||
// Read and parse the message.
|
// Read and parse the message.
|
||||||
data, err := io.ReadAll(req.Body)
|
data, err := io.ReadAll(req.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
var mbe *http.MaxBytesError
|
||||||
|
if errors.As(err, &mbe) {
|
||||||
|
http.Error(w, fmt.Sprintf("request body exceeds %d bytes", mbe.Limit), http.StatusRequestEntityTooLarge)
|
||||||
|
return
|
||||||
|
}
|
||||||
http.Error(w, "failed to read body", http.StatusBadRequest)
|
http.Error(w, "failed to read body", http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -260,7 +286,11 @@ func (h *SSEHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
transport := &SSEServerTransport{Endpoint: endpoint.RequestURI(), Response: w}
|
transport := &SSEServerTransport{
|
||||||
|
Endpoint: endpoint.RequestURI(),
|
||||||
|
Response: w,
|
||||||
|
MaxRequestBodyBytes: h.opts.MaxRequestBodyBytes,
|
||||||
|
}
|
||||||
|
|
||||||
// The session is terminated when the request exits.
|
// The session is terminated when the request exits.
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
|
|
|
||||||
|
|
@ -383,3 +383,52 @@ func TestSSELocalhostProtection(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestSSEServerTransportMaxRequestBodyBytes exercises the limit on the exported
|
||||||
|
// [SSEServerTransport] directly, since it is documented as usable on its own.
|
||||||
|
func TestSSEServerTransportMaxRequestBodyBytes(t *testing.T) {
|
||||||
|
requestOfSize := func(n int) []byte {
|
||||||
|
b := bytes.Repeat([]byte(" "), n)
|
||||||
|
b[0], b[n-1] = '{', '}'
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
testCases := []struct {
|
||||||
|
name string
|
||||||
|
limit int64
|
||||||
|
request []byte
|
||||||
|
wantCode int
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "over limit returns",
|
||||||
|
limit: 1024,
|
||||||
|
request: requestOfSize(2048),
|
||||||
|
wantCode: http.StatusRequestEntityTooLarge,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "under limit accepted",
|
||||||
|
limit: 1024,
|
||||||
|
request: []byte(`{"jsonrpc":"2.0","id":1,"method":"ping"}`),
|
||||||
|
wantCode: http.StatusAccepted,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range testCases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
tr := &SSEServerTransport{
|
||||||
|
Endpoint: "/msg",
|
||||||
|
Response: httptest.NewRecorder(),
|
||||||
|
MaxRequestBodyBytes: tc.limit,
|
||||||
|
}
|
||||||
|
if _, err := tr.Connect(context.Background()); err != nil {
|
||||||
|
t.Fatalf("Connect: %v", err)
|
||||||
|
}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/msg", bytes.NewReader(tc.request))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
tr.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != tc.wantCode {
|
||||||
|
t.Errorf("status = %d, want %d", rec.Code, tc.wantCode)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue