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 #16012 from swordqiu/hotfix/qj-gen-policy-extra-override

Browse Source 
fix: gen policy extra override policy
This commit is contained in:
Zexi Li
2023-02-21 11:25:08 +08:00
committed by GitHub
parent 917742eaf8 9f6999972e
commit 6d79f3f0c2
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/locale/genpolicy.go
+16 -3
View File
@@ -28,7 +28,8 @@ var (
func getAdminPolicy(services map[string][]string) jsonutils.JSONObject {
policy := jsonutils.NewDict()
for k, resList := range services {
for k := range services {
resList := services[k]
if len(resList) == 0 {
policy.Add(allowResult, k)
} else {
@@ -127,9 +128,21 @@ func getViewerPolicy(services map[string][]string) jsonutils.JSONObject {
func addExtraPolicy(policy *jsonutils.JSONDict, extra map[string]map[string][]string) jsonutils.JSONObject {
for s, resources := range extra {
resourcePolicy := jsonutils.NewDict()
var resourcePolicy *jsonutils.JSONDict
resPolicy, _ := policy.Get(s)
if resPolicy != nil {
resourcePolicy = resPolicy.(*jsonutils.JSONDict)
} else {
resourcePolicy = jsonutils.NewDict()
}
for r, actions := range resources {
actionPolicy := jsonutils.NewDict()
var actionPolicy *jsonutils.JSONDict
actPolicy, _ := resourcePolicy.Get(r)
if actPolicy != nil {
actionPolicy = actPolicy.(*jsonutils.JSONDict)
} else {
actionPolicy = jsonutils.NewDict()
}
for i := range actions {
actionPolicy.Add(allowResult, actions[i])
}