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

Merge pull request #5392 from swordqiu/hotfix/qj-scoped-resource-miss-fetch-owner

Browse Source 
fix: scoped resource should override FetchOwnerId
This commit is contained in:
Zexi Li
2020-03-07 15:50:55 +08:00
committed by GitHub
parent 27027b498d 6b183bac94
commit ff4d99012d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/scoperesource.go
+5 -1
View File
@@ -45,7 +45,7 @@ func (m *SScopedResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, userCred
switch scope {
case rbacutils.ScopeDomain:
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("domain_id"), userCred.GetDomainId()),
sqlchemy.Equals(q.Field("domain_id"), userCred.GetProjectDomainId()),
sqlchemy.IsNullOrEmpty(q.Field("domain_id")),
))
case rbacutils.ScopeProject:
@@ -57,6 +57,10 @@ func (m *SScopedResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, userCred
return q
}
func (m *SScopedResourceBaseManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
return FetchProjectInfo(ctx, data)
}
func (m *SScopedResourceBaseManager) ValidateCreateData(man IScopedResourceManager, ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, input api.ScopedResourceCreateInput) (api.ScopedResourceCreateInput, error) {
if input.Scope == "" {
input.Scope = string(rbacutils.ScopeSystem)