[v9.2.x] DataSourcePermissions: Handle licensing properly for ds permissions (#59711)
DataSourcePermissions: Handle licensing properly for ds permissions (#59694)
* RBAC: add viewer grand if dspermissions enforcement is not enabled
* RBAC: Change permissions based on role prefix
* RBAC: Add option to for permission service to add a license middleware
* RBAC: Remove actions from query struct
(cherry picked from commit 6d1bcd9f40)
This commit is contained in:
@@ -25,7 +25,6 @@ type getUserPermissionsTestCase struct {
|
||||
userPermissions []string
|
||||
teamPermissions []string
|
||||
builtinPermissions []string
|
||||
actions []string
|
||||
expected int
|
||||
}
|
||||
|
||||
@@ -58,16 +57,6 @@ func TestAccessControlStore_GetUserPermissions(t *testing.T) {
|
||||
builtinPermissions: []string{"5", "6"},
|
||||
expected: 5,
|
||||
},
|
||||
{
|
||||
desc: "Should filter on actions",
|
||||
orgID: 1,
|
||||
role: "",
|
||||
userPermissions: []string{"1", "2", "10"},
|
||||
teamPermissions: []string{"100", "2"},
|
||||
builtinPermissions: []string{"5", "6"},
|
||||
expected: 3,
|
||||
actions: []string{"dashboards:write"},
|
||||
},
|
||||
{
|
||||
desc: "should only get br permissions for anonymous user",
|
||||
anonymousUser: true,
|
||||
@@ -132,7 +121,6 @@ func TestAccessControlStore_GetUserPermissions(t *testing.T) {
|
||||
OrgID: tt.orgID,
|
||||
UserID: userID,
|
||||
Roles: roles,
|
||||
Actions: tt.actions,
|
||||
TeamIDs: teamIDs,
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user