public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access control: Update evaluator to authorize when at least one of the scopes is a match (#33393)

Browse Source
This commit is contained in:
Vardan Torosyan
2021-04-27 18:22:18 +02:00
committed by GitHub
parent 43bfa2801c
commit 5bf6d7dad8
4 changed files with 87 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/roles.go
+5 -5
View File
@@ -18,7 +18,7 @@ var ldapAdminReadRole = RoleDTO{
var ldapAdminEditRole = RoleDTO{
Name: ldapAdminEdit,
Version: 1,
Permissions: concat(ldapAdminReadRole.Permissions, []Permission{
Permissions: ConcatPermissions(ldapAdminReadRole.Permissions, []Permission{
{
Action: ActionLDAPUsersSync,
},
@@ -39,7 +39,7 @@ var orgsAdminReadRole = RoleDTO{
var orgsAdminEditRole = RoleDTO{
Name: orgsAdminEdit,
Version: 1,
Permissions: concat(orgsAdminReadRole.Permissions, []Permission{
Permissions: ConcatPermissions(orgsAdminReadRole.Permissions, []Permission{
{
Action: ActionOrgUsersAdd,
Scope: ScopeOrgAllUsersAll,
@@ -69,7 +69,7 @@ var orgsCurrentReadRole = RoleDTO{
var orgsCurrentEditRole = RoleDTO{
Name: orgsCurrentEdit,
Version: 1,
Permissions: concat(orgsCurrentReadRole.Permissions, []Permission{
Permissions: ConcatPermissions(orgsCurrentReadRole.Permissions, []Permission{
{
Action: ActionOrgUsersAdd,
Scope: ScopeOrgCurrentUsersAll,
@@ -111,7 +111,7 @@ var usersAdminReadRole = RoleDTO{
var usersAdminEditRole = RoleDTO{
Name: usersAdminEdit,
Version: 1,
Permissions: concat(usersAdminReadRole.Permissions, []Permission{
Permissions: ConcatPermissions(usersAdminReadRole.Permissions, []Permission{
{
Action: ActionUsersPasswordUpdate,
Scope: ScopeUsersAll,
@@ -205,7 +205,7 @@ var PredefinedRoleGrants = map[string][]string{
},
}
func concat(permissions ...[]Permission) []Permission {
func ConcatPermissions(permissions ...[]Permission) []Permission {
if permissions == nil {
return nil
}