fix: remove multiple domains in gFunction and simplify cache (casbin#265)

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

Author: tangyang9464

examples/rbac_with_multiple_domains_model.conf

@@ -427,10 +427,8 @@ private boolean enforce(String matcher, Object... rvals) {
                 Assertion ast = entry.getValue();
 
                 RoleManager rm = ast.rm;
-                AviatorFunction aviatorFunction = BuiltInFunctions.generateGFunctionClass.generateGFunction(key, rm);
+                AviatorFunction aviatorFunction = BuiltInFunctions.GenerateGFunctionClass.generateGFunction(key, rm);
                 gFunctions.put(key, aviatorFunction);
-
-                BuiltInFunctions.generateGFunctionClass.updateGFunctionCache(key);
             }
         }
         for (AviatorFunction f : gFunctions.values()) {

examples/rbac_with_multiple_domains_policy.csv

@@ -334,15 +334,10 @@ public static boolean allMatch(String key1, String key2) {
     }
 
 
-    public static class generateGFunctionClass{
+    public static class GenerateGFunctionClass{
         // key:name such as g,g2  value:user-role mapping
         private static Map<String, Map<String, AviatorBoolean>> memorizedMap = new HashMap<>();
 
-        public static void updateGFunctionCache(String name){
-            Map<String, AviatorBoolean> memorized = memorizedMap.get(name);
-            memorized = new HashMap<>();
-        }
-
         /**
          * generateGFunction is the factory method of the g(_, _) function.
          *
@@ -361,66 +356,26 @@ public AviatorObject variadicCall(Map<String, Object> env, AviatorObject... args
                     if(len < 2){
                         return AviatorBoolean.valueOf(false);
                     }
-                    Object name1Obj = FunctionUtils.getJavaObject(args[0], env);
+                    String name1 = FunctionUtils.getStringValue(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);
-                    } else{
-                        name1 = (String) name1Obj;
-                    }
 
                     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;
-                        }
+                    for (AviatorObject arg : args) {
+                        String name = FunctionUtils.getStringValue(arg, env);
+                        key += ";" + name;
                     }
-
-                    AviatorBoolean value = memorized.get(key);
-                    if (value != null) {
-                        return value;
+                    if (memorized.containsKey(key)) {
+                        return memorized.get(key);
                     }
 
+                    AviatorBoolean value;
                     if (rm == null) {
                         value = AviatorBoolean.valueOf(name1.equals(name2));
                     } else if (len == 2) {
-                        if (name1List!=null) {
-                            boolean res = false;
-                            for (Object obj : name1List) {
-                                if (rm.hasLink((String) obj, name2)){
-                                    res = true;
-                                    break;
-                                }
-                            }
-                            value = AviatorBoolean.valueOf(res);
-                        }
                         value = AviatorBoolean.valueOf(rm.hasLink(name1, name2));
                     } else if (len == 3) {
                         String domain = FunctionUtils.getStringValue(args[2], env);
                         value = AviatorBoolean.valueOf(rm.hasLink(name1, name2, domain));
-                    } else if (len == 4) {
-                        String p_dom = FunctionUtils.getStringValue(args[3], env);
-                        Object domainObj = FunctionUtils.getJavaObject(args[2], env);
-
-                        boolean res = false;
-                        if (domainObj instanceof java.util.List){
-                            Sequence domainSeq = RuntimeUtils.seq(domainObj,env);
-                            for (Object r_dom : domainSeq) {
-                                if (r_dom.equals(p_dom) && rm.hasLink(name1, name2, (String) r_dom)){
-                                    res = true;
-                                    break;
-                                }
-                            }
-                        }
-                        value = AviatorBoolean.valueOf(res);
                     } else {
                         value = AviatorBoolean.valueOf(false);
                     }

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

@@ -151,15 +151,6 @@ public void testRBACModelWithDomains() {
         testDomainEnforce(e, "bob", "domain2", "data2", "write", true);
     }
 
-    @Test
-    public void testRBACModelWithMultiDomains() {
-        Enforcer e = new Enforcer("examples/rbac_with_multiple_domains_model.conf", "examples/rbac_with_multiple_domains_policy.csv");
-
-        testDomainEnforce(e, "alice", "data1", "edit", Arrays.asList("dom1","dom2","dom3"),false);
-        testDomainEnforce(e, "alice", "data1", "read", Arrays.asList("dom1","dom2","dom3"),true);
-        testDomainEnforce(e, "alice", "data1", "write", Arrays.asList("dom1","dom2","dom3"),true);
-    }
-
     @Test
     public void testRBACModelWithDomainsAtRuntime() {
         Enforcer e = new Enforcer("examples/rbac_with_domains_model.conf");

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

@@ -17,6 +17,7 @@
 import org.casbin.jcasbin.util.Util;
 import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
@@ -86,6 +87,16 @@ public void testRoleAPI() {
         testEnforce(e, "bob", "data2", "write", true);
     }
 
+    @Test
+    public void testGFunctionCache() {
+        Enforcer e = new Enforcer("examples/rbac_model.conf", "examples/rbac_policy.csv");
+
+        testEnforce(e, "alice", "data2", "read", true);
+        e.removeGroupingPolicy(Arrays.asList("alice","data2_admin"));
+        // Ensure that the gFunction cache is different for each enforce
+        testEnforce(e, "alice", "data2", "read", false);
+    }
+
     @Test
     public void testPermissionAPI() {
         Enforcer e = new Enforcer("examples/basic_without_resources_model.conf", "examples/basic_without_resources_policy.csv");