From 90035f97865cc47ce41e22991f5d291a8ecb83be Mon Sep 17 00:00:00 2001 From: Leonor Oliveira <9090754+leonorfmartins@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:45:20 +0100 Subject: [PATCH] Remove permissions call which would get folders again (#98729) * Remove permissions call which would get folders again * Remove comment --- pkg/services/libraryelements/database.go | 7 ------- .../libraryelements/libraryelements_permissions_test.go | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go index cd64949b7e5..3aa863aaa45 100644 --- a/pkg/services/libraryelements/database.go +++ b/pkg/services/libraryelements/database.go @@ -22,7 +22,6 @@ import ( "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/sqlstore/migrator" - "github.com/grafana/grafana/pkg/services/sqlstore/searchstore" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" ) @@ -299,12 +298,6 @@ func (l *LibraryElementService) getLibraryElements(c context.Context, store db.D builder.Write(getFromLibraryElementDTOWithMeta(store.GetDialect())) builder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id AND le.folder_id <> 0") writeParamSelectorSQL(&builder, params...) - - // use permission filter if lib panel RBAC isn't enabled - if !l.features.IsEnabled(c, featuremgmt.FlagLibraryPanelRBAC) { - builder.WriteDashboardPermissionFilter(signedInUser, dashboardaccess.PERMISSION_VIEW, searchstore.TypeFolder) - } - builder.Write(` OR dashboard.id=0`) if err := session.SQL(builder.GetSQLString(), builder.GetParams()...).Find(&libraryElements); err != nil { return err diff --git a/pkg/services/libraryelements/libraryelements_permissions_test.go b/pkg/services/libraryelements/libraryelements_permissions_test.go index 302936dec17..a07092269ad 100644 --- a/pkg/services/libraryelements/libraryelements_permissions_test.go +++ b/pkg/services/libraryelements/libraryelements_permissions_test.go @@ -362,7 +362,7 @@ func TestLibraryElementsGetPermissions(t *testing.T) { permissions: map[string][]string{ dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("Other_folder")}, }, - status: http.StatusNotFound, + status: http.StatusForbidden, }, } for _, testCase := range getCases {