From 9f6999972e8b30e34e11218ebb285b89d469c284 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Mon, 20 Feb 2023 23:04:50 +0800
Subject: [PATCH] fix: gen policy extra override policy

---
 pkg/keystone/locale/genpolicy.go | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkg/keystone/locale/genpolicy.go b/pkg/keystone/locale/genpolicy.go
index ff1c411230..fb4d1c4cac 100644
--- a/pkg/keystone/locale/genpolicy.go
+++ b/pkg/keystone/locale/genpolicy.go
@@ -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])
 			}