fix: fix the cache for g function (casbin#240)

Signed-off-by: Yixiang Zhao <[email protected]>

Author: seriouszyx

src/main/java/org/casbin/jcasbin/main/CoreEnforcer.java

@@ -57,12 +57,6 @@ public class CoreEnforcer {
     boolean autoNotifyWatcher = true;
     boolean autoNotifyDispatcher = true;
 
-    // cached instance of AviatorEvaluatorInstance
-    AviatorEvaluatorInstance aviatorEval;
-
-    // detect changes in Model so that we can invalidate AviatorEvaluatorInstance cache
-    int modelModCount;
-
     void initialize() {
         rmMap = new HashMap<>();
         eft = new DefaultEffector();
@@ -129,7 +123,6 @@ public void loadModel() {
         model.loadModel(this.modelPath);
         model.printModel();
         fm = FunctionMap.loadFunctionMap();
-        aviatorEval = null;
     }
 
     /**
@@ -149,7 +142,6 @@ public Model getModel() {
     public void setModel(Model model) {
         this.model = model;
         fm = FunctionMap.loadFunctionMap();
-        aviatorEval = null;
     }
 
     /**
@@ -399,37 +391,31 @@ private boolean enforce(String matcher, Object... rvals) {
         if (!enabled) {
             return true;
         }
-        if (aviatorEval == null || modelModCount != model.getModCount()) {
-            synchronized (this) {
-                if (aviatorEval == null || modelModCount != model.getModCount()) {
-                    // AviatorEvaluator instance must be rebuild
-                    Map<String, AviatorFunction> functions = new HashMap<>();
-                    for (Map.Entry<String, AviatorFunction> entry : fm.fm.entrySet()) {
-                        String key = entry.getKey();
-                        AviatorFunction function = entry.getValue();
-
-                        functions.put(key, function);
-                    }
-                    if (model.model.containsKey("g")) {
-                        for (Map.Entry<String, Assertion> entry : model.model.get("g").entrySet()) {
-                            String key = entry.getKey();
-                            Assertion ast = entry.getValue();
-
-                            RoleManager rm = ast.rm;
-                            functions.put(key, BuiltInFunctions.generateGFunction(key, rm));
-                        }
-                    }
 
-                    aviatorEval = AviatorEvaluator.newInstance();
-                    for (AviatorFunction f : functions.values()) {
-                        aviatorEval.addFunction(f);
-                    }
-                    fm.setAviatorEval(aviatorEval);
+        Map<String, AviatorFunction> functions = new HashMap<>();
+        for (Map.Entry<String, AviatorFunction> entry : fm.fm.entrySet()) {
+            String key = entry.getKey();
+            AviatorFunction function = entry.getValue();
 
-                    modelModCount = model.getModCount();
-                }
+            functions.put(key, function);
+        }
+        if (model.model.containsKey("g")) {
+            for (Map.Entry<String, Assertion> entry : model.model.get("g").entrySet()) {
+                String key = entry.getKey();
+                Assertion ast = entry.getValue();
+
+                RoleManager rm = ast.rm;
+                functions.put(key, BuiltInFunctions.generateGFunction(key, rm));
+            }
+        }
+        AviatorEvaluatorInstance aviatorEval = AviatorEvaluator.newInstance();
+        for (AviatorFunction f : functions.values()) {
+            if (aviatorEval.containsFunction(f.getName())) {
+                aviatorEval.removeFunction(f.getName());
             }
+            aviatorEval.addFunction(f);
         }
+        fm.setAviatorEval(aviatorEval);
 
         String expString;
         if (matcher == null || "".equals(matcher)) {
@@ -599,7 +585,6 @@ private boolean validateEnforceSection(String section, Object... rvals) {
      * need to call it explicitly if you manipulate directly Model.
      */
     public void resetExpressionEvaluator() {
-        aviatorEval = null;
         fm.setAviatorEval(null);
     }
 

src/main/java/org/casbin/jcasbin/main/ManagementEnforcer.java

@@ -589,7 +589,6 @@ public boolean addGroupingPolicies(String[][] rules) {
     public boolean addNamedGroupingPolicy(String ptype, List<String> params) {
         boolean ruleAdded = addPolicy("g", ptype, params);
 
-        aviatorEval = null;
         fm.setAviatorEval(null);
         return ruleAdded;
     }
@@ -695,7 +694,6 @@ public boolean removeFilteredGroupingPolicy(int fieldIndex, String... fieldValue
     public boolean removeNamedGroupingPolicy(String ptype, List<String> params) {
         boolean ruleRemoved = removePolicy("g", ptype, params);
 
-        aviatorEval = null;
         fm.setAviatorEval(null);
         return ruleRemoved;
     }
@@ -745,7 +743,6 @@ public boolean removeNamedGroupingPolicies(String ptype, String[][] rules) {
     public boolean removeFilteredNamedGroupingPolicy(String ptype, int fieldIndex, String... fieldValues) {
         boolean ruleRemoved = removeFilteredPolicy("g", ptype, fieldIndex, fieldValues);
 
-        aviatorEval = null;
         fm.setAviatorEval(null);
         return ruleRemoved;
     }
@@ -758,7 +755,7 @@ public boolean removeFilteredNamedGroupingPolicy(String ptype, int fieldIndex, S
      */
     public void addFunction(String name, CustomFunction function) {
         fm.addFunction(name, function);
-        aviatorEval = null;
+
         fm.setAviatorEval(null);
     }
 

src/main/java/org/casbin/jcasbin/util/BuiltInFunctions.java

@@ -341,31 +341,37 @@ public static boolean allMatch(String key1, String key2) {
      * @return the function.
      */
     public static AviatorFunction generateGFunction(String name, RoleManager rm) {
-        return new AbstractVariadicFunction() {
 
+        Map<String, AviatorBoolean> memorized = new HashMap<>();
+
+        return new AbstractVariadicFunction() {
             @Override
             public AviatorObject variadicCall(Map<String, Object> env, AviatorObject... args) {
-                Map<String, AviatorBoolean> memorized = new HashMap<>();
-
                 int len = args.length;
                 if(len < 2){
                     return AviatorBoolean.valueOf(false);
                 }
-                String key = "";
                 Object name1Obj = FunctionUtils.getJavaObject(args[0], env);
                 String name2 = FunctionUtils.getStringValue(args[1], env);
                 Sequence name1List = null;
                 String name1 = null;
                 if (name1Obj instanceof java.util.List) {
                     name1List = RuntimeUtils.seq(name1Obj,env);
-                    for (Object obj : name1List) {
-                        key += ";" + obj;
-                    }
-                    key += ";" + name2;
-                }
-                else{
+                } else{
                     name1 = (String) name1Obj;
-                    key = ";" + name1 + ";" + name2;
+                }
+
+                String key = "";
+                for (int i = 0; i < len; i++) {
+                    Object nameObj = FunctionUtils.getJavaObject(args[i], env);
+                    if (nameObj instanceof java.util.List) {
+                        Sequence nameList = RuntimeUtils.seq(name, env);
+                        for (Object obj : nameList) {
+                            key += ";" + obj;
+                        }
+                    } else {
+                        key += ";" + nameObj;
+                    }
                 }
 
                 AviatorBoolean value = memorized.get(key);
@@ -408,7 +414,6 @@ public AviatorObject variadicCall(Map<String, Object> env, AviatorObject... args
                 } else {
                     value = AviatorBoolean.valueOf(false);
                 }
-
                 memorized.put(key, value);
                 return value;
             }