Merge pull request #131 from Sagilio/master

test: Add custom function model test
casbin · Feb 17, 2021 · c7ec287 · c7ec287
2 parents 3932724 + 4204a10
commit c7ec287
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/NetCasbin.UnitTest/Fixtures/TestModelFixture.cs b/NetCasbin.UnitTest/Fixtures/TestModelFixture.cs
@@ -16,6 +16,7 @@ public class TestModelFixture
         internal readonly string _ipMatchModelText = ReadTestFile("ipmatch_model.conf");
         internal readonly string _keyMatchModelText = ReadTestFile("keymatch_model.conf");
         internal readonly string _keyMatch2ModelText = ReadTestFile("keymatch2_model.conf");
+        internal readonly string _keyMatchCustomModelText = ReadTestFile("keymatch_custom_model.conf");
         internal readonly string _priorityModelText = ReadTestFile("priority_model.conf");
         internal readonly string _rbacModelText = ReadTestFile("rbac_model.conf");
         internal readonly string _rbacWithDenyModelText = ReadTestFile("rbac_with_deny_model.conf");

diff --git a/NetCasbin.UnitTest/ModelTest.cs b/NetCasbin.UnitTest/ModelTest.cs
@@ -477,6 +477,25 @@ public void TestKeyMatch2Model()
             TestEnforce(e, "alice", "/alice_data2/myid/using/res_id", "GET", true);
         }
 
+        [Fact]
+        public void TestKeyMatchCustomModel()
+        {
+            static bool CustomFunction(string key1, string key2)
+            {
+                return key1 is "/alice_data2/myid/using/res_id" && key2 is "/alice_data/:resource"
+                       || key1 is "/alice_data2/myid/using/res_id" && key2 is "/alice_data2/:id/using/:resId";
+            }
+
+            var e = new Enforcer(TestModelFixture.GetNewTestModel(
+                _testModelFixture._keyMatchCustomModelText,
+                _testModelFixture._keyMatch2PolicyText));
+
+            e.AddFunction("keyMatchCustom", CustomFunction);
+
+            TestEnforce(e, "alice", "/alice_data2/myid", "GET", false);
+            TestEnforce(e, "alice", "/alice_data2/myid/using/res_id", "GET", true);
+        }
+
         public class TestResource
         {
             public TestResource(string name, string owner)

diff --git a/NetCasbin.UnitTest/NetCasbin.UnitTest.csproj b/NetCasbin.UnitTest/NetCasbin.UnitTest.csproj
@@ -79,6 +79,9 @@
     <None Update="examples\keymatch2_policy.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="examples\keymatch_custom_model.conf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="examples\keymatch_model.conf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/NetCasbin.UnitTest/examples/keymatch_custom_model.conf b/NetCasbin.UnitTest/examples/keymatch_custom_model.conf
@@ -0,0 +1,11 @@
+[request_definition]
+r = sub, obj, act
+
+[policy_definition]
+p = sub, obj, act
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = r.sub == p.sub && keyMatchCustom(r.obj, p.obj) && regexMatch(r.act, p.act)
diff --git a/NetCasbin/ManagementEnforcer.cs b/NetCasbin/ManagementEnforcer.cs
@@ -988,5 +988,15 @@ public void AddFunction(string name, Delegate function)
         {
             ExpressionHandler.SetFunction(name, function);
         }
+
+        /// <summary>
+        /// Adds a customized function.
+        /// </summary>
+        /// <param name="name">The name of the new function.</param>
+        /// <param name="function">The function.</param>
+        public void AddFunction(string name, Func<string, string, bool> function)
+        {
+            AddFunction(name, (Delegate) function);
+        }
     }
 }