From 096d82660fd327c776c4256dab102578d5d7acfa Mon Sep 17 00:00:00 2001 From: Kacper Stasik Date: Tue, 6 Dec 2022 22:54:38 +0100 Subject: [PATCH] fix: cors headers not added to the response #2922 --- cmd/daemon/serve.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/daemon/serve.go b/cmd/daemon/serve.go index 2fb55273b896..ae92288e7018 100644 --- a/cmd/daemon/serve.go +++ b/cmd/daemon/serve.go @@ -108,13 +108,14 @@ func ServePublic(r driver.Registry, cmd *cobra.Command, args []string, slOpts *s r.RegisterPublicRoutes(ctx, router) r.PrometheusManager().RegisterRouter(router.Router) - if options, enabled := r.Config().CORS(ctx, "public"); enabled { - n.UseFunc(cors.New(options).ServeHTTP) + var handler http.Handler = n + options, enabled := r.Config().CORS(ctx, "public") + if enabled { + handler = cors.New(options).Handler(handler) } certs := c.GetTLSCertificatesForPublic(ctx) - var handler http.Handler = n if tracer := r.Tracer(ctx); tracer.IsLoaded() { handler = otelx.TraceHandler(handler, otelhttp.WithTracerProvider(tracer.Provider())) }