Skip to content
Draft
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
15 changes: 14 additions & 1 deletion ipc/middlewares.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"fmt"
"log/slog"
"net/http"
"runtime/debug"

semconv "github.com/getlantern/semconv"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/propagation"
semconv "github.com/getlantern/semconv"
"go.opentelemetry.io/otel/trace"

rlog "github.com/getlantern/radiance/log"
Expand Down Expand Up @@ -70,6 +71,18 @@ func (r *statusRecorder) Flush() {
}
}

func panicRecovery(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
defer func() {
if rec := recover(); rec != nil {
slog.Error("IPC handler panic", "panic", rec, "stack", string(debug.Stack()))
http.Error(w, "internal server error", http.StatusInternalServerError)
}
}()
next.ServeHTTP(w, r)
})
}

func authPeer(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
peer := usrFromContext(r.Context())
Expand Down
4 changes: 3 additions & 1 deletion ipc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ func (s *Server) Start() error {
if err := s.svr.Serve(l); err != nil && !errors.Is(err, http.ErrServerClosed) {
slog.Error("IPC server error", "error", err)
}
slog.Info("IPC server closed")
s.closed.Store(true)
}()
return nil
Expand Down Expand Up @@ -264,12 +265,13 @@ func newLocalAPI(b *backend.LocalBackend, withAuth bool) *localapi {
// Env (dev/testing)
mux.HandleFunc(envEndpoint, traced(s.envHandler))

// Build the middleware chain: log -> (optional auth) -> mux
// Build the middleware chain: panic recovery -> log -> (optional auth) -> mux
var handler http.Handler = mux
if withAuth {
handler = authPeer(handler)
}
handler = logger(handler)
handler = panicRecovery(handler)
s.handler = handler

return s
Expand Down
Loading