feat: add 'in' sytanx support

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

Author: tangyang9464

examples/in_op_sytanx.conf

@@ -0,0 +1,12 @@
+[request_definition]
+r = sub, obj
+
+[policy_definition]
+p = sub
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = r.sub.name == p.sub && r.sub.name in (r.obj.admins)
+

examples/in_op_sytanx.csv

@@ -0,0 +1 @@
+p, alice

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

@@ -17,6 +17,7 @@
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.AviatorEvaluatorInstance;
 import com.googlecode.aviator.Expression;
+import com.googlecode.aviator.lexer.token.OperatorType;
 import com.googlecode.aviator.runtime.type.AviatorFunction;
 import org.casbin.jcasbin.effect.DefaultEffector;
 import org.casbin.jcasbin.effect.Effect;
@@ -436,6 +437,8 @@ private boolean enforce(String matcher, Object... rvals) {
         } else {
             expString = Util.removeComments(Util.escapeAssertion(matcher));
         }
+
+        expString = Util.convertInSyntax(expString);
         Expression expression = aviatorEval.compile(expString, true);
 
         Effect[] policyEffects;

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

@@ -107,6 +107,23 @@ public static String escapeAssertion(String s) {
         return sb.toString();
     }
 
+    /**
+     * convertInSyntax Convert 'in' to 'seq' to fit aviatorscript,because aviatorscript don't support native 'in' syntax
+     *
+     * @param expString the value of the matcher
+     * @return the 'seq' expression.
+     */
+    public static String convertInSyntax(String expString) {
+        String reg = "((r|p)[0-9]*?_[.a-zA-Z]*?) *?in *?\\((.*?)\\)";
+        Matcher m1 = Pattern.compile(reg).matcher(expString);
+        StringBuffer sb = new StringBuffer();
+        boolean flag=false;
+        while (m1.find()) {
+            flag=true;
+            m1.appendReplacement(sb,"seq.some($3, fn(x) {x == $1}) != nil");
+        }
+        return flag?sb.toString():expString;
+    }
     /**
      * removeComments removes the comments starting with # in the text.
      *

src/test/java/org/casbin/jcasbin/main/EnforcerUnitTest.java

@@ -14,6 +14,8 @@
 
 package org.casbin.jcasbin.main;
 
+import com.googlecode.aviator.AviatorEvaluator;
+import com.googlecode.aviator.Expression;
 import org.casbin.jcasbin.model.Model;
 import org.casbin.jcasbin.persist.Adapter;
 import org.casbin.jcasbin.persist.file_adapter.FileAdapter;
@@ -23,7 +25,9 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import static java.util.Arrays.asList;
@@ -218,10 +222,19 @@ public void testNotUsedRBACModelInMemory() {
         testEnforce(e, "bob", "data2", "write", true);
     }
 
+    @Test
+    public void testInOp() {
+        Enforcer e = new Enforcer("examples/in_op_sytanx.conf", "examples/in_op_sytanx.csv");
+
+        TestSub sub = new TestSub("alice");
+        TestObj obj = new TestObj(new String[]{"alice","bob"});
+
+        assertTrue(e.enforce(sub,obj));
+    }
+
     @Test
     public void testReloadPolicy() {
         Enforcer e = new Enforcer("examples/rbac_model.conf", "examples/rbac_policy.csv");
-
         e.loadPolicy();
         testGetPolicy(e, asList(asList("alice", "data1", "read"), asList("bob", "data2", "write"), asList("data2_admin", "data2", "read"), asList("data2_admin", "data2", "write")));
     }
@@ -572,4 +585,46 @@ public void testBatchEnforceWithMatcher() {
             asList("root", "data3", "read"), asList("jack", "data3", "read")));
         Assert.assertArrayEquals(myResults.toArray(new Boolean[0]), results.toArray(new Boolean[0]));
     }
+
+    public static class TestSub{
+        private String name;
+
+        public TestSub(String name) {
+            this.name = name;
+        }
+
+        public String getName() { return name; }
+
+        public void setName(String name) { this.name = name; }
+    }
+    public static class TestAdmins{
+        private String name;
+
+        public TestAdmins(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+    public static class TestObj{
+        private String[] admins;
+
+        public TestObj(String[] admins) {
+            this.admins = admins;
+        }
+
+        public String[] getAdmins() {
+            return admins;
+        }
+
+        public void setAdmins(String[] admins) {
+            this.admins = admins;
+        }
+    }
 }

src/test/java/org/casbin/jcasbin/main/UtilTest.java

@@ -40,6 +40,13 @@ public void testEscapeAssertion(){
     assertEquals("(r_attp.value || p_attr)p_u", Util.escapeAssertion("(r.attp.value || p.attr)p.u"));
   }
 
+    @Test
+    public void testConvertInSyntax(){
+        assertEquals("seq.some(r_obj, fn(x) {x == r_sub}) != nil", Util.convertInSyntax("r_sub in (r_obj)"));
+        assertEquals("seq.some(r_obj, fn(x) {x == r_sub.name}) != nil", Util.convertInSyntax("r_sub.name in (r_obj)"));
+        assertEquals("seq.some(r_obj.name, fn(x) {x == r_sub.name}) != nil", Util.convertInSyntax("r_sub.name in (r_obj.name)"));
+    }
+
   @Test
   public void testRemoveComments(){
     assertEquals("r.act == p.act", Util.removeComments("r.act == p.act # comments"));