Files
coder/codersdk/drpcsdk/server.go
T
George K 156c8b6e41 fix: prevent coderd crashes from unsupported Tailnet RPCs (#28429)
Workspace agents could call RefreshResumeToken and WorkspaceUpdates,
even though agent connections do not configure the providers those RPCs
require. The resulting nil dereference panicked a DRPC handler and
crashed coderd.

Limit the agent Tailnet surface to its supported RPCs, return
`Unimplemented` when optional providers are absent, and recover panics
in Coder-owned DRPC servers so they return an internal error instead of
crashing the process.

Refs: https://linear.app/codercom/issue/PLAT-464
2026-09-03 13:29:17 -07:00

40 lines
900 B
Go

package drpcsdk
import (
"runtime/debug"
"storj.io/drpc"
"storj.io/drpc/drpcserver"
"cdr.dev/slog/v3"
)
// NewServer constructs a dRPC server that recovers panics from RPC handlers.
func NewServer(logger slog.Logger, handler drpc.Handler, options drpcserver.Options) *drpcserver.Server {
return drpcserver.NewWithOptions(&recoverHandler{
logger: logger,
handler: handler,
}, options)
}
type recoverHandler struct {
logger slog.Logger
handler drpc.Handler
}
func (h *recoverHandler) HandleRPC(stream drpc.Stream, rpc string) (err error) {
defer func() {
if r := recover(); r != nil {
h.logger.Error(stream.Context(),
"panic serving dRPC request (recovered)",
slog.F("rpc", rpc),
slog.F("panic", r),
slog.F("stack", string(debug.Stack())),
)
err = drpc.InternalError.New("panic serving dRPC request")
}
}()
return h.handler.HandleRPC(stream, rpc)
}