From a99ded14e301f0b81cd982c2e5b0f2b044fb17d8 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 27 Dec 2018 00:07:15 +0800 Subject: [PATCH] minor fixes --- pkg/cloudcommon/policy/policy.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/cloudcommon/policy/policy.go b/pkg/cloudcommon/policy/policy.go index 57cdfa26ae..d6f2ad2e97 100644 --- a/pkg/cloudcommon/policy/policy.go +++ b/pkg/cloudcommon/policy/policy.go @@ -267,8 +267,8 @@ func unifyRbacResult(isAdmin bool, currentPriv rbacutils.TRbacResult) rbacutils. } func exportRbacResult(currentPriv rbacutils.TRbacResult) rbacutils.TRbacResult { - // if currentPriv == rbacutils.AdminAllow || currentPriv == rbacutils.OwnerAllow { - if currentPriv == rbacutils.AdminAllow { + if currentPriv == rbacutils.AdminAllow || currentPriv == rbacutils.OwnerAllow { + // if currentPriv == rbacutils.AdminAllow { return rbacutils.Allow } return currentPriv @@ -276,7 +276,6 @@ func exportRbacResult(currentPriv rbacutils.TRbacResult) rbacutils.TRbacResult { func (manager *SPolicyManager) explainPolicy(userCred mcclient.TokenCredential, policyReq jsonutils.JSONObject, name string) ([]string, rbacutils.TRbacResult, error) { isAdmin, request, result, err := manager.explainPolicyInternal(userCred, policyReq, name) - log.Errorf("%v %s %s %s", isAdmin, request, result, err) if !isAdmin && isAdminResource(request[0], request[1]) && result == rbacutils.OwnerAllow { result = rbacutils.Deny }