IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 23:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

RBAC: Search fix userID filter (#81337)

Browse Source
This commit is contained in:
Gabriel MABILLE 2024-01-26 11:23:48 +01:00 committed by GitHub
parent cd443b24db
commit 7512b1a519
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/services/accesscontrol/api/api.go
View File

@ -68,18 +68,21 @@ func (api *AccessControlAPI) getUserPermissions(c *contextmodel.ReqContext) resp
// GET /api/access-control/users/permissions/search
func (api *AccessControlAPI) searchUsersPermissions(c *contextmodel.ReqContext) response.Response {
userIDString := c.Query("userId")
userID, err := strconv.ParseInt(userIDString, 10, 64)
if err != nil {
return response.Error(http.StatusBadRequest, "user ID is invalid", err)
}
searchOptions := ac.SearchOptions{
UserLogin: c.Query("userLogin"),
ActionPrefix: c.Query("actionPrefix"),
Action: c.Query("action"),
Scope: c.Query("scope"),
}
searchOptions.UserID = userID
userIDString := c.Query("userId")
if userIDString != "" {
userID, err := strconv.ParseInt(userIDString, 10, 64)
if err != nil {
return response.Error(http.StatusBadRequest, "user ID is invalid", err)
}
searchOptions.UserID = userID
}
// Validate inputs
if (searchOptions.ActionPrefix != "") && (searchOptions.Action != "") {

13
pkg/services/accesscontrol/api/api_test.go
View File

@ -162,6 +162,19 @@ func TestAccessControlAPI_searchUsersPermissions(t *testing.T) {
expectedCode: http.StatusOK,
expectedOutput: map[int64]map[string][]string{2: {"users:read": {"users:*"}}},
},
{
desc: "Should work with valid action filter",
filters: "?actionPrefix=users:",
permissions: map[int64][]ac.Permission{
1: {{Action: "users:write", Scope: "users:id:1"}},
2: {{Action: "users:read", Scope: "users:id:2"}},
},
expectedCode: http.StatusOK,
expectedOutput: map[int64]map[string][]string{
1: {"users:write": {"users:id:1"}},
2: {"users:read": {"users:id:2"}},
},
},
}
for _, tt := range tests {
t.Run(tt.desc, func(t *testing.T) {