IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Folders: GetFolders to return empty respons if user does not have any permissions (#81304)

Browse Source 
add check for list of permissions
This commit is contained in:
Yuri Tseretyan 2024-01-26 12:12:45 -05:00 committed by GitHub
parent 09fcb3c6cc
commit a081abdd25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/folder/folderimpl/folder.go
View File

@ -131,6 +131,9 @@ func (s *Service) GetFolders(ctx context.Context, q folder.GetFoldersQuery) ([]*
permissions := q.SignedInUser.GetPermissions() permissions := q.SignedInUser.GetPermissions()
folderPermissions := permissions[dashboards.ActionFoldersRead] folderPermissions := permissions[dashboards.ActionFoldersRead]
qry.ancestorUIDs = make([]string, 0, len(folderPermissions)) qry.ancestorUIDs = make([]string, 0, len(folderPermissions))
if len(folderPermissions) == 0 && !q.SignedInUser.GetIsGrafanaAdmin() {
return nil, nil
}
for _, p := range folderPermissions { for _, p := range folderPermissions {
if p == dashboards.ScopeFoldersAll { if p == dashboards.ScopeFoldersAll {
// no need to query for folders with permissions // no need to query for folders with permissions

11
pkg/services/folder/folderimpl/folder_test.go
View File

@ -1309,6 +1309,7 @@ func TestIntegrationNestedFolderSharedWithMe(t *testing.T) {
orgID: { orgID: {
dashboards.ActionFoldersCreate: {}, dashboards.ActionFoldersCreate: {},
dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersAll}, dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersAll},
dashboards.ActionFoldersRead: {dashboards.ScopeFoldersAll},
}, },
}} }}
@ -1587,6 +1588,16 @@ func TestIntegrationNestedFolderSharedWithMe(t *testing.T) {
}, },
}, },
}, },
{
name: "Should not get any folders if user has no permissions",
cmd: folder.GetFoldersQuery{
OrgID: orgID,
SignedInUser: &user.SignedInUser{UserID: 999, OrgID: orgID, Permissions: map[int64]map[string][]string{
orgID: {},
}},
},
expected: nil,
},
} }
for _, tc := range testCases { for _, tc := range testCases {