Skip to content

mcp: cover all branches on nil checks for json response #2275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nacx merged 1 commit into from
Jun 22, 2026
Merged

mcp: cover all branches on nil checks for json response #2275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions internal/mcpproxy/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,17 +302,17 @@ func (m *mcpRequestContext) servePOST(w http.ResponseWriter, r *http.Request) {

switch msg := rawMsg.(type) {
case *jsonrpc.Response:
// We do require a Session ID. If it is not present, a 400 Bad Request response should be returned:
// https://modelcontextprotocol.io/specification/2025-06-18/basic/transports#session-management
if s == nil {
errType = metrics.MCPErrorInvalidSessionID
onErrorResponse(w, http.StatusBadRequest, "missing session ID")
return
}
if doNotForwardResponseToBackends(msg) {
w.Header().Set(sessionIDHeader, string(s.clientGatewaySessionID()))
w.WriteHeader(http.StatusAccepted)
} else {
// We do require a Session ID. If it is not present, a 400 Bad Request response should be returned:
// https://modelcontextprotocol.io/specification/2025-06-18/basic/transports#session-management
if s == nil {
errType = metrics.MCPErrorInvalidSessionID
onErrorResponse(w, http.StatusBadRequest, "missing session ID")
return
}
m.l.Debug("Decoded MCP response", slog.Any("response", msg))
result, err = m.handleClientToServerResponse(ctx, s, w, msg)
}
Expand Down