From 100ea7704709929d0f243cf282aae4e7e9b11465 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:20:30 +0300 Subject: [PATCH] [v11.0.x] RBAC: List only the folders that the user has access to (#89015) 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 c7a74ff7d2b..78481896427 100644 --- a/pkg/services/folder/folderimpl/folder.go +++ b/pkg/services/folder/folderimpl/folder.go @@ -349,10 +349,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() {