Auth: Use auth broker by default (#69620)

remove authnservice toggle
This commit is contained in:
Jo
2023-06-07 08:57:41 +02:00
committed by GitHub
parent e17ef5e504
commit aee5c6dea0
12 changed files with 27 additions and 29 deletions
@@ -139,7 +139,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
reqContext.Logger = reqContext.Logger.New("traceID", traceID)
}
if h.features.IsEnabled(featuremgmt.FlagAuthnService) {
if h.Cfg.AuthBrokerEnabled {
identity, err := h.authnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp})
if err != nil {
if errors.Is(err, auth.ErrInvalidSessionToken) {
@@ -207,7 +207,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
)
// when using authn service this is implemented as a post auth hook
if !h.features.IsEnabled(featuremgmt.FlagAuthnService) {
if !h.Cfg.AuthBrokerEnabled {
// update last seen every 5min
if reqContext.ShouldUpdateLastSeenAt() {
reqContext.Logger.Debug("Updating last user_seen_at", "user_id", reqContext.UserID)
-6
View File
@@ -279,12 +279,6 @@ var (
Expression: "true", // enabled by default
Owner: grafanaDashboardsSquad,
},
{
Name: "authnService",
Description: "Use new auth service to perform authentication",
State: FeatureStateAlpha,
Owner: grafanaAuthnzSquad,
},
{
Name: "disablePrometheusExemplarSampling",
Description: "Disable Prometheus exemplar sampling",
-1
View File
@@ -40,7 +40,6 @@ nestedFolders,beta,@grafana/backend-platform,false,false,false,false
accessTokenExpirationCheck,stable,@grafana/grafana-authnz-team,false,false,false,false
showTraceId,alpha,@grafana/observability-logs,false,false,false,false
emptyDashboardPage,stable,@grafana/dashboards-squad,false,false,false,true
authnService,alpha,@grafana/grafana-authnz-team,false,false,false,false
disablePrometheusExemplarSampling,stable,@grafana/observability-metrics,false,false,false,false
alertingBacktesting,alpha,@grafana/alerting-squad,false,false,false,false
editPanelCSVDragAndDrop,alpha,@grafana/grafana-bi-squad,false,false,false,true
1 Name State Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
40 accessTokenExpirationCheck stable @grafana/grafana-authnz-team false false false false
41 showTraceId alpha @grafana/observability-logs false false false false
42 emptyDashboardPage stable @grafana/dashboards-squad false false false true
authnService alpha @grafana/grafana-authnz-team false false false false
43 disablePrometheusExemplarSampling stable @grafana/observability-metrics false false false false
44 alertingBacktesting alpha @grafana/alerting-squad false false false false
45 editPanelCSVDragAndDrop alpha @grafana/grafana-bi-squad false false false true
-4
View File
@@ -171,10 +171,6 @@ const (
// Enable the redesigned user interface of a dashboard page that includes no panels
FlagEmptyDashboardPage = "emptyDashboardPage"
// FlagAuthnService
// Use new auth service to perform authentication
FlagAuthnService = "authnService"
// FlagDisablePrometheusExemplarSampling
// Disable Prometheus exemplar sampling
FlagDisablePrometheusExemplarSampling = "disablePrometheusExemplarSampling"