Merge pull request #164 from Sagilio/fix#106_re

fix: Unable replace multiple eval

NetCasbin.UnitTest/EnforcerTest.cs

@@ -936,5 +936,21 @@ public void TestEnforceWithMultipleRoleManager()
             result = e.Enforce("@adm-user", "org::customer1", "cust1", "manage");
             Assert.False(result);
         }
+
+        [Fact]
+        public void TestEnforceWithMultipleEval()
+        {
+            var e = new Enforcer(TestModelFixture.GetNewTestModel(
+                _testModelFixture._rbacMultipleEvalModelText,
+                _testModelFixture._rbacMultipleEvalPolicyText));
+
+            bool result = e.Enforce(
+                "domain1",
+                new { Role = "admin" },
+                new { Name = "admin_panel" },
+                "view");
+
+            Assert.True(result);
+        }
     }
 }

NetCasbin.UnitTest/Fixtures/TestModelFixture.cs

@@ -45,6 +45,11 @@ public class TestModelFixture
         internal readonly string _rbacMultipleModelText = ReadTestFile("rbac_multiple_rolemanager_model.conf");
         internal readonly string _rbacMultiplePolicyText = ReadTestFile("rbac_multiple_rolemanager_policy.csv");
 
+        // https://github.com/casbin/Casbin.NET/issues/106
+        internal readonly string _rbacMultipleEvalModelText = ReadTestFile("rbac_multiple_eval_model.conf");
+        internal readonly string _rbacMultipleEvalPolicyText = ReadTestFile("rbac_multiple_eval_policy.csv");
+
+
         public Model.Model GetNewAbacModel()
         {
             return GetNewTestModel(_abacModelText);

NetCasbin.UnitTest/NetCasbin.UnitTest.csproj

@@ -106,6 +106,12 @@
     <None Update="examples\rbac_muitiple_rolemanager_model.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="examples\rbac_multiple_eval_model.conf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="examples\rbac_multiple_eval_policy.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="examples\rbac_multiple_rolemanager_model.conf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

NetCasbin.UnitTest/examples/rbac_multiple_eval_model.conf

@@ -0,0 +1,11 @@
+[request_definition]
+r = dom, sub, obj, act
+
+[policy_definition]
+p = dom, sub_rule, obj_rule, act
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = r.dom == p.dom && eval(p.sub_rule) && eval(p.obj_rule) && r.act == p.act

NetCasbin.UnitTest/examples/rbac_multiple_eval_policy.csv

@@ -0,0 +1 @@
+p, domain1, r.sub.Role == "admin", r.obj.Name == "admin_panel", view

NetCasbin/Util/Utility.cs

@@ -163,7 +163,6 @@ internal static void LogPrint(string v)
 
         private static readonly Regex s_evalRegex = new Regex(@"\beval\((?<rule>[^)]*)\)");
 
-
         /// <summary>
         /// Determines whether matcher contains eval function
         /// </summary>
@@ -182,21 +181,26 @@ internal static bool HasEval(string expressString)
         /// <returns></returns>
         internal static bool TryGetEvalRuleNames(string expressString, out IEnumerable<string> evalRuleNames)
         {
-            var match = s_evalRegex.Match(expressString);
-            var group = match.Groups;
-            int subMatchCount = group.Count - 1;
-            if (subMatchCount > 0)
+            MatchCollection matches = s_evalRegex.Matches(expressString);
+            int matchCount = matches.Count;
+            if (matchCount is 0)
+            {
+                evalRuleNames = null;
+                return false;
+            }
+            string[] rules = new string[matchCount];
+            for (int i = 0; i < matchCount; i++)
             {
-                var rules = new string[subMatchCount];
-                for (int i = 0; i < subMatchCount; i++)
+                GroupCollection group = matches[i].Groups;
+                if (group.Count < 2)
                 {
-                    rules[i] = group[i + 1].Value;
+                    evalRuleNames = null;
+                    return false;
                 }
-                evalRuleNames = rules;
-                return true;
+                rules[i] = group[1].Value;
             }
-            evalRuleNames = null;
-            return false;
+            evalRuleNames = rules;
+            return true;
         }
 
         /// <summary>