opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keystone): filter users by role assignment domain

Browse Source
This commit is contained in:
ioito
2023-03-02 14:31:23 +08:00
parent 494a83965c
commit 0ac60af2b2
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/users.go
+15 -2
View File
@@ -413,8 +413,21 @@ func (manager *SUserManager) ListItemFilter(
return nil, httperrors.NewGeneralError(err)
}
}
subq := AssignmentManager.fetchRoleUserIdsQuery(role.GetId())
q = q.In("id", subq.SubQuery())
subq := AssignmentManager.Query("actor_id").Equals("role_id", role.GetId()).Equals("type", api.AssignmentUserProject).Distinct()
if len(query.RoleAssignmentDomainId) > 0 {
domain, err := DomainManager.FetchByIdOrName(userCred, query.RoleAssignmentDomainId)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(DomainManager.Keyword(), query.RoleAssignmentDomainId)
} else {
return nil, httperrors.NewGeneralError(err)
}
}
projects := ProjectManager.Query("id").Equals("domain_id", domain.GetId()).SubQuery()
subq = subq.In("target_id", projects.Query())
}
q = q.In("id", subq.SubQuery().Query())
}
if len(query.IdpId) > 0 {