chore: ensure internalQuerier utilizes identical authMiddleware to API (#3439)

Signed-off-by: Jacob Lisi <[email protected]>

Author: jtlisi

pkg/api/api.go

@@ -51,12 +51,13 @@ func (cfg *Config) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet) {
 }
 
 type API struct {
-	cfg            Config
-	authMiddleware middleware.Interface
-	server         *server.Server
-	logger         log.Logger
-	sourceIPs      *middleware.SourceIPExtractor
-	indexPage      *IndexPageContent
+	AuthMiddleware middleware.Interface
+
+	cfg       Config
+	server    *server.Server
+	logger    log.Logger
+	sourceIPs *middleware.SourceIPExtractor
+	indexPage *IndexPageContent
 }
 
 func New(cfg Config, serverCfg server.Config, s *server.Server, logger log.Logger) (*API, error) {
@@ -75,7 +76,7 @@ func New(cfg Config, serverCfg server.Config, s *server.Server, logger log.Logge
 
 	api := &API{
 		cfg:            cfg,
-		authMiddleware: cfg.HTTPAuthMiddleware,
+		AuthMiddleware: cfg.HTTPAuthMiddleware,
 		server:         s,
 		logger:         logger,
 		sourceIPs:      sourceIPs,
@@ -84,7 +85,7 @@ func New(cfg Config, serverCfg server.Config, s *server.Server, logger log.Logge
 
 	// If no authentication middleware is present in the config, use the default authentication middleware.
 	if cfg.HTTPAuthMiddleware == nil {
-		api.authMiddleware = middleware.AuthenticateUser
+		api.AuthMiddleware = middleware.AuthenticateUser
 	}
 
 	return api, nil
@@ -97,7 +98,7 @@ func (a *API) RegisterRoute(path string, handler http.Handler, auth bool, method
 
 	level.Debug(a.logger).Log("msg", "api: registering route", "methods", strings.Join(methods, ","), "path", path, "auth", auth)
 	if auth {
-		handler = a.authMiddleware.Wrap(handler)
+		handler = a.AuthMiddleware.Wrap(handler)
 	}
 	if len(methods) == 0 {
 		a.server.HTTP.Path(path).Handler(handler)
@@ -109,7 +110,7 @@ func (a *API) RegisterRoute(path string, handler http.Handler, auth bool, method
 func (a *API) RegisterRoutesWithPrefix(prefix string, handler http.Handler, auth bool, methods ...string) {
 	level.Debug(a.logger).Log("msg", "api: registering route", "methods", strings.Join(methods, ","), "prefix", prefix, "auth", auth)
 	if auth {
-		handler = a.authMiddleware.Wrap(handler)
+		handler = a.AuthMiddleware.Wrap(handler)
 	}
 	if len(methods) == 0 {
 		a.server.HTTP.PathPrefix(prefix).Handler(handler)

pkg/cortex/modules.go

@@ -11,7 +11,6 @@ import (
 	"github.com/prometheus/prometheus/rules"
 	prom_storage "github.com/prometheus/prometheus/storage"
 	httpgrpc_server "github.com/weaveworks/common/httpgrpc/server"
-	"github.com/weaveworks/common/middleware"
 	"github.com/weaveworks/common/server"
 
 	"github.com/cortexproject/cortex/pkg/alertmanager"
@@ -290,7 +289,7 @@ func (t *Cortex) initQuerier() (serv services.Service, err error) {
 		// If queries are processed using the external HTTP Server, we need wrap the internal querier with
 		// HTTP router with middleware to parse the tenant ID from the HTTP header and inject it into the
 		// request context.
-		internalQuerierRouter = middleware.AuthenticateUser.Wrap(internalQuerierRouter)
+		internalQuerierRouter = t.API.AuthMiddleware.Wrap(internalQuerierRouter)
 	}
 
 	// Query frontend worker will only be started after all its dependencies are started, not here.