opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(keystone): support projectDomainId in SAssignmentManager.FetchAll

Browse Source
This commit is contained in:
rainzm
2021-01-13 20:01:12 +08:00
parent 80092443a7
commit afbb4a0470
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/assignments.go
+12 -5
View File
@@ -458,6 +458,7 @@ func roleAssignmentHandler(ctx context.Context, w http.ResponseWriter, r *http.R
input.Role.Id,
input.Scope.Domain.Id,
input.Scope.Project.Id,
"",
input.Users,
input.Groups,
input.Roles,
@@ -481,7 +482,7 @@ func roleAssignmentHandler(ctx context.Context, w http.ResponseWriter, r *http.R
}
func (manager *SAssignmentManager) queryAll(
userId, groupId, roleId, domainId, projectId string,
userId, groupId, roleId, domainId, projectId string, projectDomainId string,
users, groups, roles, domains, projects, projectDomains []string,
) *sqlchemy.SQuery {
assigments := manager.Query().SubQuery()
@@ -563,6 +564,12 @@ func (manager *SAssignmentManager) queryAll(
))
q = q.In("project_id", subq.SubQuery()).In("type", []string{api.AssignmentUserProject, api.AssignmentGroupProject})
}
if len(projectDomainId) > 0 {
subq := ProjectManager.Query("id")
domainQ := DomainManager.Query("id", "name").Equals("id", projectDomainId).SubQuery()
subq = subq.Join(domainQ, sqlchemy.Equals(subq.Field("domain_id"), domainQ.Field("id")))
q = q.In("project_id", subq.SubQuery()).In("type", []string{api.AssignmentUserProject, api.AssignmentGroupProject})
}
if len(projectDomains) > 0 {
subq := ProjectManager.Query("id")
domainQ := DomainManager.Query("id", "name").SubQuery()
@@ -638,17 +645,17 @@ func (assign *sAssignmentInternal) getRoleAssignment(domains, projects, groups,
}
func (manager *SAssignmentManager) FetchAll(
userId, groupId, roleId, domainId, projectId string,
userId, groupId, roleId, domainId, projectId string, projectDomainId string,
userStrs, groupStrs, roleStrs, domainStrs, projectStrs, projectDomainStrs []string,
includeNames, effective, includeSub, includeSystem, includePolicies bool,
limit, offset int) ([]api.SRoleAssignment, int64, error) {
var q *sqlchemy.SQuery
if effective {
usrq := manager.queryAll(userId, "", roleId, domainId, projectId, userStrs, nil, roleStrs, domainStrs, projectStrs, projectDomainStrs).In("type", []string{api.AssignmentUserProject, api.AssignmentUserDomain})
usrq := manager.queryAll(userId, "", roleId, domainId, projectId, projectDomainId, userStrs, nil, roleStrs, domainStrs, projectStrs, projectDomainStrs).In("type", []string{api.AssignmentUserProject, api.AssignmentUserDomain})
memberships := UsergroupManager.Query("user_id", "group_id").SubQuery()
grpproj := manager.queryAll("", groupId, roleId, domainId, projectId, nil, groupStrs, roleStrs, domainStrs, projectStrs, projectDomainStrs).In("type", []string{api.AssignmentGroupProject, api.AssignmentGroupDomain}).SubQuery()
grpproj := manager.queryAll("", groupId, roleId, domainId, projectId, projectDomainId, nil, groupStrs, roleStrs, domainStrs, projectStrs, projectDomainStrs).In("type", []string{api.AssignmentGroupProject, api.AssignmentGroupDomain}).SubQuery()
q2 := grpproj.Query(
grpproj.Field("type"),
memberships.Field("user_id"),
@@ -672,7 +679,7 @@ func (manager *SAssignmentManager) FetchAll(
q = sqlchemy.Union(usrq, q2).Query().Distinct()
} else {
q = manager.queryAll(userId, groupId, roleId, domainId, projectId, userStrs, groupStrs, roleStrs, domainStrs, projectStrs, projectDomainStrs).Distinct()
q = manager.queryAll(userId, groupId, roleId, domainId, projectId, projectDomainId, userStrs, groupStrs, roleStrs, domainStrs, projectStrs, projectDomainStrs).Distinct()
}
if !includeSystem {
pkg/keystone/tokens/token.go
+1 -1
View File
@@ -293,7 +293,7 @@ func (t *SAuthToken) getTokenV3(
token.Token.Projects[i].Domain.Id = extProjs[i].DomainId
token.Token.Projects[i].Domain.Name = extProjs[i].DomainName
}*/
assigns, _, err := models.AssignmentManager.FetchAll(user.Id, "", "", "", "",
assigns, _, err := models.AssignmentManager.FetchAll(user.Id, "", "", "", "", "",
nil, nil, nil, nil, nil, nil,
true, true, true, true, true, 0, 0)
if err != nil {