mcp: fix potential nil-pointer dereference on message send (#1115)
This commit is contained in:
parent
cc4db25347
commit
bc72835f62
2 changed files with 12 additions and 7 deletions
|
|
@ -2403,13 +2403,12 @@ func (c *streamableClientConn) setMCPHeaders(req *http.Request, msg jsonrpc.Mess
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
switch {
|
if pv := protocolVersionFromMessage(msg); pv != "" {
|
||||||
case protocolVersionFromMessage(msg) != "":
|
req.Header.Set(protocolVersionHeader, pv)
|
||||||
req.Header.Set(protocolVersionHeader, protocolVersionFromMessage(msg))
|
} else if pv := protocolVersionFromContext(req.Context()); pv != "" {
|
||||||
case c.initializedResult != nil:
|
req.Header.Set(protocolVersionHeader, pv)
|
||||||
|
} else if c.initializedResult != nil {
|
||||||
req.Header.Set(protocolVersionHeader, c.initializedResult.ProtocolVersion)
|
req.Header.Set(protocolVersionHeader, c.initializedResult.ProtocolVersion)
|
||||||
case protocolVersionFromContext(req.Context()) != "":
|
|
||||||
req.Header.Set(protocolVersionHeader, protocolVersionFromContext(req.Context()))
|
|
||||||
}
|
}
|
||||||
if c.sessionID != "" {
|
if c.sessionID != "" {
|
||||||
req.Header.Set(sessionIDHeader, c.sessionID)
|
req.Header.Set(sessionIDHeader, c.sessionID)
|
||||||
|
|
@ -2424,7 +2423,7 @@ func (c *streamableClientConn) setMCPHeaders(req *http.Request, msg jsonrpc.Mess
|
||||||
// nil msg.
|
// nil msg.
|
||||||
func protocolVersionFromMessage(msg jsonrpc.Message) string {
|
func protocolVersionFromMessage(msg jsonrpc.Message) string {
|
||||||
req, ok := msg.(*jsonrpc.Request)
|
req, ok := msg.(*jsonrpc.Request)
|
||||||
if !ok {
|
if !ok || req == nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
meta := extractRequestMeta(req.Params)
|
meta := extractRequestMeta(req.Params)
|
||||||
|
|
|
||||||
|
|
@ -1386,6 +1386,12 @@ func TestStreamableClientConnSetMCPHeaders_ProtocolVersion(t *testing.T) {
|
||||||
msg jsonrpc.Message
|
msg jsonrpc.Message
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
|
{
|
||||||
|
name: "nil checked",
|
||||||
|
initializedResult: nil,
|
||||||
|
msg: (*jsonrpc.Request)(nil),
|
||||||
|
want: "",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "message meta wins when initializedResult unset",
|
name: "message meta wins when initializedResult unset",
|
||||||
initializedResult: nil,
|
initializedResult: nil,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue