[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:
Karl Persson
2022-12-02 14:07:20 +01:00
committed by GitHub
parent c0e7cb2bc1
commit 3148a918ce
9 changed files with 28 additions and 42 deletions
+5 -5
View File
@@ -211,11 +211,11 @@ func (p Permission) OSSPermission() Permission {
}
type GetUserPermissionsQuery struct {
OrgID int64 `json:"-"`
UserID int64 `json:"userId"`
Roles []string
Actions []string
TeamIDs []int64
OrgID int64
UserID int64
Roles []string
TeamIDs []int64
RolePrefix string
}
// ResourcePermission is structure that holds all actions that either a team / user / builtin-role