Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions internal/server/mcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,15 @@ func (m *sseManager) get(id string) (*sseSession, bool) {
m.mu.Lock()
defer m.mu.Unlock()
session, ok := m.sseSessions[id]
if ok {
session.lastActive = time.Now()
if !ok || session == nil {
// Be defensive: a nil session entry should be treated as unavailable.
if ok && session == nil {
delete(m.sseSessions, id)
}
return nil, false
}
return session, ok
session.lastActive = time.Now()
return session, true
}

func newSseManager(ctx context.Context) *sseManager {
Expand Down Expand Up @@ -489,7 +494,10 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
var ok bool
session, ok = s.sseManager.get(sessionId)
if !ok {
s.logger.DebugContext(ctx, "sse session not available")
err := fmt.Errorf("sse session not available")
s.logger.DebugContext(ctx, err.Error())
_ = render.Render(w, r, newErrResponse(err, http.StatusBadRequest))
return
}
}

Expand Down
16 changes: 16 additions & 0 deletions internal/server/mcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1184,3 +1184,19 @@ func TestSseManagerGetNonExistentSession(t *testing.T) {
t.Error("expected nil session for non-existent ID")
}
}

func TestSseManagerGetNilSessionValue(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

m := newSseManager(ctx)
m.sseSessions["nil-session-id"] = nil

session, ok := m.get("nil-session-id")
if ok {
t.Error("expected ok to be false for nil session value")
}
if session != nil {
t.Error("expected nil session for nil session value")
}
}
Loading