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

RBAC: Update permission query to not join on team table (#53677)

Browse Source 
* RBAC: Add teamIDs to get permission query

* RBAC: Remove join on team table and use team ids

* RBAC: Pass team ids
This commit is contained in:
Karl Persson
2022-08-15 09:41:20 +02:00
committed by GitHub
parent 97eec9c220
commit 4069fe1c39
4 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go
View File

@@ -102,6 +102,10 @@ func (ac *OSSAccessControlService) Evaluate(ctx context.Context, user *user.Sign
return resolvedEvaluator.Evaluate(user.Permissions[user.OrgID]), nil
}
var actionsToFetch = append(
TeamAdminActions, append(DashboardAdminActions, FolderAdminActions...)...,
)
// GetUserPermissions returns user permissions based on built-in roles
func (ac *OSSAccessControlService) GetUserPermissions(ctx context.Context, user *user.SignedInUser, _ accesscontrol.Options) ([]accesscontrol.Permission, error) {
timer := prometheus.NewTimer(metrics.MAccessPermissionsSummary)
@@ -113,7 +117,8 @@ func (ac *OSSAccessControlService) GetUserPermissions(ctx context.Context, user
OrgID: user.OrgID,
UserID: user.UserID,
Roles: accesscontrol.GetOrgRoles(ac.cfg, user),
Actions: append(TeamAdminActions, append(DashboardAdminActions, FolderAdminActions...)...),
TeamIDs: user.Teams,
Actions: actionsToFetch,
})
if err != nil {
return nil, err