From eab471a17c8a9cd39266ce7e34168eee833bf780 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:54:31 +0300 Subject: [PATCH] [v11.1.x] RBAC: List only the folders that the user has access to (#89016) RBAC: List only the folders that the user has access to (#88599) only check folder permissions when listing folders (cherry picked from commit 095ca66d9f1e4b1951dc56b5a985646dfe61dee7) Co-authored-by: Ieva --- pkg/services/folder/folderimpl/folder.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go index e70f220ea94..2acad94b1c1 100644 --- a/pkg/services/folder/folderimpl/folder.go +++ b/pkg/services/folder/folderimpl/folder.go @@ -347,10 +347,8 @@ func (s *Service) getRootFolders(ctx context.Context, q *folder.GetChildrenQuery var folderPermissions []string if q.Permission == dashboardaccess.PERMISSION_EDIT { folderPermissions = permissions[dashboards.ActionFoldersWrite] - folderPermissions = append(folderPermissions, permissions[dashboards.ActionDashboardsWrite]...) } else { folderPermissions = permissions[dashboards.ActionFoldersRead] - folderPermissions = append(folderPermissions, permissions[dashboards.ActionDashboardsRead]...) } if len(folderPermissions) == 0 && !q.SignedInUser.GetIsGrafanaAdmin() {