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

minor fixes

Browse Source
This commit is contained in:
Qiu Jian
2018-12-27 00:07:15 +08:00
parent cd3f46871a
commit a99ded14e3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/policy/policy.go
+2 -3
View File
@@ -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
}