fix: duplicated policies inside rules to add

Signed-off-by: Cheng JIANG <jiang.cheng@vip.163.com>

management_api_test.go

@@ -155,9 +155,13 @@ func TestModifyPolicyAPI(t *testing.T) {
 	e.AddPolicy("eve", "data3", "read")
 
 	rules := [][]string{
+		{"jack", "data4", "read"},
+		{"jack", "data4", "read"},
 		{"jack", "data4", "read"},
 		{"katy", "data4", "write"},
 		{"leyo", "data4", "read"},
+		{"katy", "data4", "write"},
+		{"katy", "data4", "write"},
 		{"ham", "data4", "write"},
 	}
 

model/policy.go

@@ -31,7 +31,7 @@ const (
 	PolicyRemove
 )
 
-var DefaultSep = ","
+const DefaultSep = ","
 
 // BuildIncrementalRoleLinks provides incremental build the role inheritance relations.
 func (model Model) BuildIncrementalRoleLinks(rm rbac.RoleManager, op PolicyOp, sec string, ptype string, rules [][]string) error {
@@ -130,8 +130,13 @@ func (model Model) AddPolicy(sec string, ptype string, rule []string) {
 // AddPolicies adds policy rules to the model.
 func (model Model) AddPolicies(sec string, ptype string, rules [][]string) {
 	for _, rule := range rules {
+		hashKey := strings.Join(rule, DefaultSep)
+		_, ok := model[sec][ptype].PolicyMap[hashKey]
+		if ok {
+			continue
+		}
 		model[sec][ptype].Policy = append(model[sec][ptype].Policy, rule)
-		model[sec][ptype].PolicyMap[strings.Join(rule, DefaultSep)] = len(model[sec][ptype].Policy) - 1
+		model[sec][ptype].PolicyMap[hashKey] = len(model[sec][ptype].Policy) - 1
 	}
 }
 
@@ -187,7 +192,7 @@ func (model Model) RemoveFilteredPolicy(sec string, ptype string, fieldIndex int
 			if firstIndex == -1 {
 				firstIndex = index
 			}
-			delete(model[sec][ptype].PolicyMap, strings.Join(rule, ","))
+			delete(model[sec][ptype].PolicyMap, strings.Join(rule, DefaultSep))
 			effects = append(effects, rule)
 			res = true
 		} else {

util/util.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 )
 
-var evalReg *regexp.Regexp = regexp.MustCompile(`\beval\((?P<rule>[^),]*)\)`)
+var evalReg *regexp.Regexp = regexp.MustCompile(`\beval\((?P<rule>[^)]*)\)`)
 
 // EscapeAssertion escapes the dots in the assertion, because the expression evaluation doesn't support such variable names.
 func EscapeAssertion(s string) string {