From db6422c8a3c915bdd76154e10013f3398e1b1c2e Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Tue, 12 Nov 2024 11:52:29 +0100 Subject: [PATCH] Zanzana: Use correct namespace when evaluating permission (#96258) Use correct namespace --- pkg/services/accesscontrol/acimpl/accesscontrol.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/services/accesscontrol/acimpl/accesscontrol.go b/pkg/services/accesscontrol/acimpl/accesscontrol.go index 78697ba9a06..effccef7653 100644 --- a/pkg/services/accesscontrol/acimpl/accesscontrol.go +++ b/pkg/services/accesscontrol/acimpl/accesscontrol.go @@ -8,8 +8,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel" - "github.com/grafana/authlib/claims" - "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/metrics" @@ -133,8 +131,7 @@ func (a *AccessControl) evaluateZanzana(ctx context.Context, user identity.Reque _, _, parentFolder = accesscontrol.SplitScope(scopes[1]) } - namespace := claims.OrgNamespaceFormatter(user.GetOrgID()) - req, ok := zanzana.TranslateToCheckRequest(namespace, action, kind, parentFolder, identifier) + req, ok := zanzana.TranslateToCheckRequest(user.GetNamespace(), action, kind, parentFolder, identifier) if !ok { // unsupported translation return false, errAccessNotImplemented