From 2fcf30109da843d4202737176e92dc95a252dfd8 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 5 Mar 2020 17:43:26 +0800 Subject: [PATCH] fix: no scope shcedtag should be visible to all --- pkg/cloudcommon/db/scoperesource.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/db/scoperesource.go b/pkg/cloudcommon/db/scoperesource.go index eb80a9b75a..16f16a75c4 100644 --- a/pkg/cloudcommon/db/scoperesource.go +++ b/pkg/cloudcommon/db/scoperesource.go @@ -44,9 +44,15 @@ func (m *SScopedResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, userCred } switch scope { case rbacutils.ScopeDomain: - q = q.Filter(sqlchemy.Equals(q.Field("domain_id"), userCred.GetDomainId())) + q = q.Filter(sqlchemy.OR( + sqlchemy.Equals(q.Field("domain_id"), userCred.GetDomainId()), + sqlchemy.IsNullOrEmpty(q.Field("domain_id")), + )) case rbacutils.ScopeProject: - q = q.Filter(sqlchemy.Equals(q.Field("tenant_id"), userCred.GetProjectId())) + q = q.Filter(sqlchemy.OR( + sqlchemy.Equals(q.Field("tenant_id"), userCred.GetProjectId()), + sqlchemy.IsNullOrEmpty(q.Field("tenant_id")), + )) } return q }