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

Access control: Rename predefined roles to fixed roles (code) (#34469)

Browse Source 
* s/grafana:roles:/fixed:/

* Update free text references to predefined roles
This commit is contained in:
Emil Tullstedt
2021-05-25 15:36:01 +02:00
committed by GitHub
parent b74a502dc4
commit 0f4806db8a
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,9 @@ func (ac *OSSAccessControlService) GetUserPermissions(ctx context.Context, user
builtinRoles := ac.GetUserBuiltInRoles(user)
permissions := make([]*accesscontrol.Permission, 0)
for _, builtin := range builtinRoles {
if roleNames, ok := accesscontrol.PredefinedRoleGrants[builtin]; ok {
if roleNames, ok := accesscontrol.FixedRoleGrants[builtin]; ok {
for _, name := range roleNames {
r, exists := accesscontrol.PredefinedRoles[name]
r, exists := accesscontrol.FixedRoles[name]
if !exists {
continue
}

30
pkg/services/accesscontrol/roles.go
View File

@@ -135,13 +135,13 @@ var provisioningAdminRole = RoleDTO{
},
}
// PredefinedRoles provides a map of permission sets/roles which can be
// FixedRoles provides a map of permission sets/roles which can be
// assigned to a set of users. When adding a new resource protected by
// Grafana access control the default permissions should be added to a
// new predefined role in this set so that users can access the new
// resource. PredefinedRoleGrants lists which organization roles are
// assigned which predefined roles in this list.
var PredefinedRoles = map[string]RoleDTO{
// new fixed role in this set so that users can access the new
// resource. FixedRoleGrants lists which built-in roles are
// assigned which fixed roles in this list.
var FixedRoles = map[string]RoleDTO{
usersAdminRead: usersAdminReadRole,
usersAdminEdit: usersAdminEditRole,
@@ -155,21 +155,21 @@ var PredefinedRoles = map[string]RoleDTO{
}
const (
usersAdminEdit = "grafana:roles:users:admin:edit"
usersAdminRead = "grafana:roles:users:admin:read"
usersAdminEdit = "fixed:users:admin:edit"
usersAdminRead = "fixed:users:admin:read"
usersOrgEdit = "grafana:roles:users:org:edit"
usersOrgRead = "grafana:roles:users:org:read"
usersOrgEdit = "fixed:users:org:edit"
usersOrgRead = "fixed:users:org:read"
ldapAdminEdit = "grafana:roles:ldap:admin:edit"
ldapAdminRead = "grafana:roles:ldap:admin:read"
ldapAdminEdit = "fixed:ldap:admin:edit"
ldapAdminRead = "fixed:ldap:admin:read"
provisioningAdmin = "grafana:roles:provisioning:admin"
provisioningAdmin = "fixed:provisioning:admin"
)
// PredefinedRoleGrants specifies which organization roles are assigned
// to which set of PredefinedRoles by default. Alphabetically sorted.
var PredefinedRoleGrants = map[string][]string{
// FixedRoleGrants specifies which built-in roles are assigned
// to which set of FixedRoles by default. Alphabetically sorted.
var FixedRoleGrants = map[string][]string{
RoleGrafanaAdmin: {
ldapAdminEdit,
ldapAdminRead,

10
pkg/services/accesscontrol/roles_test.go
View File

@@ -9,10 +9,10 @@ import (
)
func TestPredefinedRoles(t *testing.T) {
for name, r := range PredefinedRoles {
for name, r := range FixedRoles {
assert.Truef(t,
strings.HasPrefix(name, "grafana:roles:"),
"expected all predefined roles to be prefixed by 'grafana:roles:', found role '%s'", name,
strings.HasPrefix(name, "fixed:"),
"expected all fixed roles to be prefixed by 'fixed:', found role '%s'", name,
)
assert.Equal(t, name, r.Name)
assert.NotZero(t, r.Version)
@@ -21,7 +21,7 @@ func TestPredefinedRoles(t *testing.T) {
}
func TestPredefinedRoleGrants(t *testing.T) {
for _, v := range PredefinedRoleGrants {
for _, v := range FixedRoleGrants {
assert.True(t,
sort.SliceIsSorted(v, func(i, j int) bool {
return v[i] < v[j]
@@ -29,7 +29,7 @@ func TestPredefinedRoleGrants(t *testing.T) {
"require role grant lists to be sorted",
)
for _, r := range v {
assert.Contains(t, PredefinedRoles, r)
assert.Contains(t, FixedRoles, r)
}
}
}