mcp: fix a race condition in logging
Reading the buffer outside of a critical section can lead to data corruption.
This commit is contained in:
parent
52e03de6c8
commit
6b75899fd7
1 changed files with 6 additions and 3 deletions
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
"slices"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
@ -165,8 +166,7 @@ func (h *LoggingHandler) Handle(ctx context.Context, r slog.Record) error {
|
||||||
|
|
||||||
func (h *LoggingHandler) handle(ctx context.Context, r slog.Record) error {
|
func (h *LoggingHandler) handle(ctx context.Context, r slog.Record) error {
|
||||||
// Observe the rate limit.
|
// Observe the rate limit.
|
||||||
// TODO(jba): use golang.org/x/time/rate. (We can't here because it would require adding
|
// TODO(jba): use golang.org/x/time/rate.
|
||||||
// golang.org/x/time to the go.mod file.)
|
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
skip := time.Since(h.lastMessageSent) < h.opts.MinInterval
|
skip := time.Since(h.lastMessageSent) < h.opts.MinInterval
|
||||||
h.mu.Unlock()
|
h.mu.Unlock()
|
||||||
|
|
@ -175,6 +175,7 @@ func (h *LoggingHandler) handle(ctx context.Context, r slog.Record) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
var data json.RawMessage
|
||||||
// Make the buffer reset atomic with the record write.
|
// Make the buffer reset atomic with the record write.
|
||||||
// We are careful here in the unlikely event that the handler panics.
|
// We are careful here in the unlikely event that the handler panics.
|
||||||
// We don't want to hold the lock for the entire function, because Notify is
|
// We don't want to hold the lock for the entire function, because Notify is
|
||||||
|
|
@ -185,6 +186,8 @@ func (h *LoggingHandler) handle(ctx context.Context, r slog.Record) error {
|
||||||
defer h.mu.Unlock()
|
defer h.mu.Unlock()
|
||||||
h.buf.Reset()
|
h.buf.Reset()
|
||||||
err = h.handler.Handle(ctx, r)
|
err = h.handler.Handle(ctx, r)
|
||||||
|
// Clone the buffer as Bytes() references the internal buffer.
|
||||||
|
data = json.RawMessage(slices.Clone(h.buf.Bytes()))
|
||||||
}()
|
}()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
@ -197,7 +200,7 @@ func (h *LoggingHandler) handle(ctx context.Context, r slog.Record) error {
|
||||||
params := &LoggingMessageParams{
|
params := &LoggingMessageParams{
|
||||||
Logger: h.opts.LoggerName,
|
Logger: h.opts.LoggerName,
|
||||||
Level: slogLevelToMCP(r.Level),
|
Level: slogLevelToMCP(r.Level),
|
||||||
Data: json.RawMessage(h.buf.Bytes()),
|
Data: data,
|
||||||
}
|
}
|
||||||
// We pass the argument context to Notify, even though slog.Handler.Handle's
|
// We pass the argument context to Notify, even though slog.Handler.Handle's
|
||||||
// documentation says not to.
|
// documentation says not to.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue