feat: Add code relates with priorityIndex (#112)

Signed-off-by: Edmond <[email protected]>

Author: Edmond-J-A

src/model/Assertion.lua

@@ -27,6 +27,7 @@ function Assertion:new()
     o.policy = {}
     o.RM = {}
     o.policyMap={}
+    o.priorityIndex=-1
     setmetatable(o,self)
     self.__index = self
     return o
@@ -98,4 +99,8 @@ function Assertion:buildIncrementalRoleLinks(rm, op, rules)
     end
 end
 
+function Assertion:initPriorityIndex()
+    self.priorityIndex = -1
+end
+
 return Assertion

src/model/Model.lua

@@ -76,6 +76,7 @@ function Model:addDef(sec, key, value)
     self.model[sec][key].key = key
     self.model[sec][key].value = value
     self.model[sec][key].policyMap={}
+    self.model[sec][key]:initPriorityIndex()
     if sec == "r" or sec == "p" then
         self.model[sec][key].tokens = Util.splitCommaDelimited(self.model[sec][key].value)
         for k, v in pairs(self.model[sec][key].tokens) do
@@ -302,19 +303,17 @@ function Model:sortPoliciesByPriority()
     if not self.model["p"] then return end
 
     for ptype, ast in pairs(self.model["p"]) do
-        local priorityIndex = 0
         for inx, token in pairs(ast.tokens) do
             if token == ptype .. "_priority" then
-                priorityIndex = inx
+                ast.priorityIndex = inx
                 break
             end
         end
-        if priorityIndex == 0 then
+        if ast.priorityIndex == -1 then
             return
         end
-
         table.sort(ast.policy, function (a, b)
-        return a[priorityIndex] < b[priorityIndex]
+        return a[ast.priorityIndex] < b[ast.priorityIndex]
         end)
         for i,policy in pairs(ast.policy) do
             ast.policyMap[table.concat(policy,",")]=i

src/model/Policy.lua

@@ -226,6 +226,25 @@ function Policy:addPolicy(sec, ptype, rule)
     if not self:hasPolicy(sec, ptype, rule) then
         table.insert(self.model[sec][ptype].policy, rule)
         self.model[sec][ptype].policyMap[table.concat(rule,",")]=#self.model[sec][ptype].policy
+        if sec == "p" and self.model[sec][ptype].priorityIndex > 0 then
+            local idxInsert=tonumber(rule[self.model[sec][ptype].priorityIndex])
+            if rule[self.model[sec][ptype].priorityIndex]~= nil then
+                local i = #self.model[sec][ptype].policy-1
+                for j=i, 1, -1 do
+                    local idx=tonumber(self.model[sec][ptype].policy[i+1][self.model[sec][ptype].priorityIndex])
+                    if idx < idxInsert then
+                        self.model[sec][ptype].policy[i+1] = self.model[sec][ptype].policy[i]
+                        self.model[sec][ptype].policyMap[table.concat(self.model[sec][ptype].policy[i+1], ",")]=i+1
+                    else
+                        i=j
+                        break
+                    end
+                    i=j
+                end
+                self.model[sec][ptype].policy[i] = rule
+                self.model[sec][ptype].policyMap[table.concat(rule,",")] = i
+            end
+        end
         return true
     end
     return false