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 #13308 from swordqiu/hotfix/qj-log-allow-view-events-of-owner-project

Browse Source 
fix: allow view events of owner objects
This commit is contained in:
Zexi Li
2022-01-25 11:17:53 +08:00
committed by GitHub
parent 897d98f056 93d611b4a2
commit 992ca0d49d
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/opslog.go
+17 -2
View File
@@ -430,15 +430,30 @@ func (self *SOpsLogManager) FilterByOwner(q *sqlchemy.SQuery, ownerId mcclient.I
switch scope {
case rbacutils.ScopeUser:
if len(ownerId.GetUserId()) > 0 {
/*
* 默认只能查看本人发起的操作
*/
q = q.Filter(sqlchemy.Equals(q.Field("user_id"), ownerId.GetUserId()))
}
case rbacutils.ScopeProject:
if len(ownerId.GetProjectId()) > 0 {
q = q.Filter(sqlchemy.Equals(q.Field("tenant_id"), ownerId.GetProjectId()))
/*
* 项目视图可以查看本项目人员发起的操作，或者对本项目资源实施的操作, QIU Jian
*/
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("tenant_id"), ownerId.GetProjectId()),
sqlchemy.Equals(q.Field("owner_tenant_id"), ownerId.GetProjectId()),
))
}
case rbacutils.ScopeDomain:
if len(ownerId.GetProjectDomainId()) > 0 {
q = q.Filter(sqlchemy.Equals(q.Field("project_domain_id"), ownerId.GetProjectDomainId()))
/*
* 域视图可以查看本域人员发起的操作，或者对本域资源实施的操作, QIU Jian
*/
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("project_domain_id"), ownerId.GetProjectDomainId()),
sqlchemy.Equals(q.Field("owner_domain_id"), ownerId.GetProjectDomainId()),
))
}
default:
// systemScope, no filter