opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-31 01:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keystone): rolepolicies list panic if filter by domain scope

Browse Source 
rolepolicies list panic if filter by scope=domain
This commit is contained in:
Qiu Jian
2020-12-08 03:12:42 +08:00
parent 7ef268ee15
commit 4411c4e5bb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/rolepolicies.go
+5 -1
View File
@@ -167,7 +167,11 @@ func (manager *SRolePolicyManager) NamespaceScope() rbacutils.TRbacScope {
}
func (manager *SRolePolicyManager) FilterByOwner(q *sqlchemy.SQuery, owner mcclient.IIdentityProvider, scope rbacutils.TRbacScope) *sqlchemy.SQuery {
return PolicyManager.FilterByOwner(q, owner, scope)
policyQ := PolicyManager.Query()
policyQ = PolicyManager.FilterByOwner(policyQ, owner, scope)
subq := policyQ.SubQuery()
q = q.Join(subq, sqlchemy.Equals(q.Field("policy_id"), subq.Field("id")))
return q
}
func (manager *SRolePolicyManager) ListItemFilter(