fix: do not auth / and /health

circonus · Jan 6, 2023 · 2f3c206 · 2f3c206
1 parent 884b9f7
commit 2f3c206
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/internal/server/server.go b/internal/server/server.go
@@ -65,38 +65,38 @@ func New(cfg *config.Config) (*Server, error) {
 	mux := http.NewServeMux()
 	mux.Handle("/", genericHandler{})
 	mux.Handle("/health", healthHandler{})
-	mux.Handle("/_bulk", http.TimeoutHandler(bulkHandler{
+	mux.Handle("/_bulk", s.verifyBasicAuth(http.TimeoutHandler(bulkHandler{
 		dest: cfg.Destination,
 		log: logger.LogWrapper{
 			Log:   log.With().Str("handler", "/_bulk").Logger(),
 			Debug: cfg.Debug,
 		},
 		dataToken: cfg.Circonus.APIKey,
 		metrics:   metrics,
-	}, handlerTimeout, "Handler timeout"))
-	mux.Handle("/_cluster/settings", clusterSettingsHandler{s: s})
-	mux.Handle("/otel-v1-apm-service-map", otelv1apmservicemapHandler{s: s})
-	mux.Handle("/_template/", templateHandler{s: s})
-	mux.Handle("/_opendistro/_ism/policies/raw-span-policy", ismPolicyHandler{s: s})
-	mux.Handle("/otel-v1-apm-span-000001", otelSpanHandler{s: s})
-	mux.Handle("/otel-v1-apm-span/_search", otelSpanSearchHandler{s: s})
-	mux.Handle("/otel-v1-apm-span/_bulk", http.TimeoutHandler(bulkHandler{
+	}, handlerTimeout, "Handler timeout")))
+	mux.Handle("/_cluster/settings", s.verifyBasicAuth(clusterSettingsHandler{s: s}))
+	mux.Handle("/otel-v1-apm-service-map", s.verifyBasicAuth(otelv1apmservicemapHandler{s: s}))
+	mux.Handle("/_template/", s.verifyBasicAuth(templateHandler{s: s}))
+	mux.Handle("/_opendistro/_ism/policies/raw-span-policy", s.verifyBasicAuth(ismPolicyHandler{s: s}))
+	mux.Handle("/otel-v1-apm-span-000001", s.verifyBasicAuth(otelSpanHandler{s: s}))
+	mux.Handle("/otel-v1-apm-span/_search", s.verifyBasicAuth(otelSpanSearchHandler{s: s}))
+	mux.Handle("/otel-v1-apm-span/_bulk", s.verifyBasicAuth(http.TimeoutHandler(bulkHandler{
 		dest: cfg.Destination,
 		log: logger.LogWrapper{
 			Log:   log.With().Str("handler", "/_bulk").Logger(),
 			Debug: cfg.Debug,
 		},
 		dataToken: cfg.Circonus.APIKey,
 		metrics:   metrics,
-	}, handlerTimeout, "Handler timeout"))
+	}, handlerTimeout, "Handler timeout")))
 
 	s.srv = &http.Server{
 		Addr:              cfg.Server.Address,
 		ReadTimeout:       readTimeout,
 		WriteTimeout:      writeTimeout,
 		IdleTimeout:       idleTimeout,
 		ReadHeaderTimeout: readHeaderTimeout,
-		Handler:           s.verifyBasicAuth(mux),
+		Handler:           mux,
 	}
 
 	return s, nil