feat: Add policy filter

Signed-off-by: sagilio <[email protected]>
casbin · Oct 23, 2022 · 8a77971 · 8a77971
1 parent 6dec197
commit 8a77971
Show file tree

Hide file tree

Showing 20 changed files with 884 additions and 569 deletions.
diff --git a/Casbin.UnitTests/ModelTests/EnforcerTest.cs b/Casbin.UnitTests/ModelTests/EnforcerTest.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Casbin.Adapter.File;
+using Casbin.Adapter.Stream;
 using Casbin.Model;
 using Casbin.Persist;
 using Casbin.Rbac;
@@ -73,10 +73,10 @@ public void TestEnforceWithoutAutoLoadPolicy()
 
         FileAdapter a = new("examples/keymatch_policy.csv");
 
-        IEnforcer e = DefaultEnforcer.Create(m, a, options => { options.AutoLoadPolicy = false; });
+        IEnforcer e = new Enforcer(m, a, options => { options.AutoLoadPolicy = false; });
         Assert.Empty(e.GetPolicy());
 
-        e = DefaultEnforcer.Create(m, a);
+        e = new Enforcer(m, a);
         Assert.NotEmpty(e.GetPolicy());
     }
 
@@ -257,19 +257,11 @@ public void TestInOperator()
             _testModelFixture._rbacInOperatorModelText,
             _testModelFixture._rbacInOperatorPolicyText));
 
-        TestEnforce(e, new
-        {
-            Name = "Alice",
-            Amount = 5100,
-            Roles = new string[] { "Manager", "DepartmentDirector" }
-        }, "authorization", "grant", true);
+        TestEnforce(e, new { Name = "Alice", Amount = 5100, Roles = new[] { "Manager", "DepartmentDirector" } },
+            "authorization", "grant", true);
 
-        TestEnforce(e, new
-        {
-            Name = "Alice",
-            Amount = 5100,
-            Roles = new string[] { "DepartmentDirector" }
-        }, "authorization", "grant", false);
+        TestEnforce(e, new { Name = "Alice", Amount = 5100, Roles = new[] { "DepartmentDirector" } },
+            "authorization", "grant", false);
     }
 
     [Fact]
@@ -354,16 +346,16 @@ public void TestRbacBatchEnforceInMemory()
 
         IEnumerable<(RequestValues<string, string, string>, bool)> testCases =
             new (RequestValues<string, string, string>, bool)[]
-        {
-            (Request.CreateValues("alice", "data1", "read"), true),
-            (Request.CreateValues("alice", "data1", "write"), false),
-            (Request.CreateValues("alice", "data2", "read"), true),
-            (Request.CreateValues("alice", "data2", "write"), true),
-            (Request.CreateValues("bob", "data1", "read"), false),
-            (Request.CreateValues("bob", "data1", "write"), false),
-            (Request.CreateValues("bob", "data2", "read"), false),
-            (Request.CreateValues("bob", "data2", "write"), true)
-        };
+            {
+                (Request.CreateValues("alice", "data1", "read"), true),
+                (Request.CreateValues("alice", "data1", "write"), false),
+                (Request.CreateValues("alice", "data2", "read"), true),
+                (Request.CreateValues("alice", "data2", "write"), true),
+                (Request.CreateValues("bob", "data1", "read"), false),
+                (Request.CreateValues("bob", "data1", "write"), false),
+                (Request.CreateValues("bob", "data2", "read"), false),
+                (Request.CreateValues("bob", "data2", "write"), true)
+            };
 
         TestBatchEnforce(e, testCases);
     }
@@ -388,16 +380,16 @@ public void TestRbacParallelBatchEnforceInMemory()
 
         IEnumerable<(RequestValues<string, string, string>, bool)> testCases =
             new (RequestValues<string, string, string>, bool)[]
-        {
-            (Request.CreateValues("alice", "data1", "read"), true),
-            (Request.CreateValues("alice", "data1", "write"), false),
-            (Request.CreateValues("alice", "data2", "read"), true),
-            (Request.CreateValues("alice", "data2", "write"), true),
-            (Request.CreateValues("bob", "data1", "read"), false),
-            (Request.CreateValues("bob", "data1", "write"), false),
-            (Request.CreateValues("bob", "data2", "read"), false),
-            (Request.CreateValues("bob", "data2", "write"), true)
-        };
+            {
+                (Request.CreateValues("alice", "data1", "read"), true),
+                (Request.CreateValues("alice", "data1", "write"), false),
+                (Request.CreateValues("alice", "data2", "read"), true),
+                (Request.CreateValues("alice", "data2", "write"), true),
+                (Request.CreateValues("bob", "data1", "read"), false),
+                (Request.CreateValues("bob", "data1", "write"), false),
+                (Request.CreateValues("bob", "data2", "read"), false),
+                (Request.CreateValues("bob", "data2", "write"), true)
+            };
 
         TestParallelBatchEnforce(e, testCases);
     }
@@ -450,16 +442,16 @@ public void TestRbacBatchEnforceInMemoryAsync()
 
         IEnumerable<(RequestValues<string, string, string>, bool)> testCases =
             new (RequestValues<string, string, string>, bool)[]
-        {
-            (Request.CreateValues("alice", "data1", "read"), true),
-            (Request.CreateValues("alice", "data1", "write"), false),
-            (Request.CreateValues("alice", "data2", "read"), true),
-            (Request.CreateValues("alice", "data2", "write"), true),
-            (Request.CreateValues("bob", "data1", "read"), false),
-            (Request.CreateValues("bob", "data1", "write"), false),
-            (Request.CreateValues("bob", "data2", "read"), false),
-            (Request.CreateValues("bob", "data2", "write"), true)
-        };
+            {
+                (Request.CreateValues("alice", "data1", "read"), true),
+                (Request.CreateValues("alice", "data1", "write"), false),
+                (Request.CreateValues("alice", "data2", "read"), true),
+                (Request.CreateValues("alice", "data2", "write"), true),
+                (Request.CreateValues("bob", "data1", "read"), false),
+                (Request.CreateValues("bob", "data1", "write"), false),
+                (Request.CreateValues("bob", "data2", "read"), false),
+                (Request.CreateValues("bob", "data2", "write"), true)
+            };
 
         TestBatchEnforceAsync(e, testCases);
     }
@@ -1178,16 +1170,16 @@ public void TestBatchEnforceWithMatcherApi()
 
         IEnumerable<(RequestValues<string, string, string>, bool)> testCases =
             new (RequestValues<string, string, string>, bool)[]
-        {
-            (Request.CreateValues("alice", "data1", "read"), false),
-            (Request.CreateValues("alice", "data1", "write"), false),
-            (Request.CreateValues("alice", "data2", "read"), false),
-            (Request.CreateValues("alice", "data2", "write"), true),
-            (Request.CreateValues("bob", "data1", "read"), true),
-            (Request.CreateValues("bob", "data1", "write"), false),
-            (Request.CreateValues("bob", "data2", "read"), false),
-            (Request.CreateValues("bob", "data2", "write"), false)
-        };
+            {
+                (Request.CreateValues("alice", "data1", "read"), false),
+                (Request.CreateValues("alice", "data1", "write"), false),
+                (Request.CreateValues("alice", "data2", "read"), false),
+                (Request.CreateValues("alice", "data2", "write"), true),
+                (Request.CreateValues("bob", "data1", "read"), true),
+                (Request.CreateValues("bob", "data1", "write"), false),
+                (Request.CreateValues("bob", "data2", "read"), false),
+                (Request.CreateValues("bob", "data2", "write"), false)
+            };
 
         e.TestBatchEnforceWithMatcher(matcher, testCases);
     }
@@ -1200,16 +1192,16 @@ public void TestBatchEnforceWithMatcherParallel()
 
         IEnumerable<(RequestValues<string, string, string>, bool)> testCases =
             new (RequestValues<string, string, string>, bool)[]
-        {
-            (Request.CreateValues("alice", "data1", "read"), false),
-            (Request.CreateValues("alice", "data1", "write"), false),
-            (Request.CreateValues("alice", "data2", "read"), false),
-            (Request.CreateValues("alice", "data2", "write"), true),
-            (Request.CreateValues("bob", "data1", "read"), true),
-            (Request.CreateValues("bob", "data1", "write"), false),
-            (Request.CreateValues("bob", "data2", "read"), false),
-            (Request.CreateValues("bob", "data2", "write"), false)
-        };
+            {
+                (Request.CreateValues("alice", "data1", "read"), false),
+                (Request.CreateValues("alice", "data1", "write"), false),
+                (Request.CreateValues("alice", "data2", "read"), false),
+                (Request.CreateValues("alice", "data2", "write"), true),
+                (Request.CreateValues("bob", "data1", "read"), true),
+                (Request.CreateValues("bob", "data1", "write"), false),
+                (Request.CreateValues("bob", "data2", "read"), false),
+                (Request.CreateValues("bob", "data2", "write"), false)
+            };
 
         e.TestBatchEnforceWithMatcherParallel(matcher, testCases);
     }
@@ -1238,16 +1230,16 @@ public void TestBatchEnforceWithMatcherApiAsync()
 
         IEnumerable<(RequestValues<string, string, string>, bool)> testCases =
             new (RequestValues<string, string, string>, bool)[]
-        {
-            (Request.CreateValues("alice", "data1", "read"), false),
-            (Request.CreateValues("alice", "data1", "write"), false),
-            (Request.CreateValues("alice", "data2", "read"), false),
-            (Request.CreateValues("alice", "data2", "write"), true),
-            (Request.CreateValues("bob", "data1", "read"), true),
-            (Request.CreateValues("bob", "data1", "write"), false),
-            (Request.CreateValues("bob", "data2", "read"), false),
-            (Request.CreateValues("bob", "data2", "write"), false)
-        };
+            {
+                (Request.CreateValues("alice", "data1", "read"), false),
+                (Request.CreateValues("alice", "data1", "write"), false),
+                (Request.CreateValues("alice", "data2", "read"), false),
+                (Request.CreateValues("alice", "data2", "write"), true),
+                (Request.CreateValues("bob", "data1", "read"), true),
+                (Request.CreateValues("bob", "data1", "write"), false),
+                (Request.CreateValues("bob", "data2", "read"), false),
+                (Request.CreateValues("bob", "data2", "write"), false)
+            };
 
         TestBatchEnforceWithMatcherAsync(e, matcher, testCases);
     }
@@ -1288,3 +1280,5 @@ await e.TestEnforceExWithMatcherAsync(matcher, "bob", "data1", "read",
 
     #endregion
 }
+
+
diff --git a/Casbin/Abstractions/IEnforcer.cs b/Casbin/Abstractions/IEnforcer.cs
@@ -22,18 +22,6 @@ namespace Casbin
     /// </summary>
     public interface IEnforcer
     {
-        public class EnforcerOptions
-        {
-            public bool Enabled { get; set; } = true;
-            public bool EnabledCache { get; set; } = true;
-
-            public bool AutoBuildRoleLinks { get; set; } = true;
-            public bool AutoNotifyWatcher { get; set; } = true;
-            public bool AutoCleanEnforceCache { get; set; } = true;
-            public bool AutoLoadPolicy { get; set; } = true;
-            public Filter AutoLoadPolicyFilter { get; set; } = null;
-        }
-
         /// <summary>
         ///     Decides whether a "subject" can access a "object" with the operation
         ///     "action", input parameters are usually: (sub, obj, act).
@@ -88,7 +76,6 @@ public BatchEnforceAsyncResults BatchEnforceAsync<TRequest>(EnforceContext conte
 
         #region Options
 
-        public EnforcerOptions Options { get; set; }
         public bool Enabled { get; set; }
         public bool EnabledCache { get; set; }
         public bool AutoBuildRoleLinks { get; set; }

diff --git a/Casbin/Abstractions/Persist/IFilteredAdapter.cs b/Casbin/Abstractions/Persist/IFilteredAdapter.cs
@@ -7,8 +7,8 @@ public interface IFilteredAdapter
     {
         bool IsFiltered { get; }
 
-        void LoadFilteredPolicy(IPolicyStore store, Filter filter);
+        void LoadFilteredPolicy(IPolicyStore store, IPolicyFilter filter);
 
-        Task LoadFilteredPolicyAsync(IPolicyStore store, Filter filter);
+        Task LoadFilteredPolicyAsync(IPolicyStore store, IPolicyFilter filter);
     }
 }
diff --git a/Casbin/Abstractions/Persist/IPersistedPolicy.cs b/Casbin/Abstractions/Persist/IPersistedPolicy.cs
@@ -0,0 +1,22 @@
+using Casbin.Model;
+
+namespace Casbin.Persist;
+
+public interface IPersistantPolicy
+{
+    public string Type { get; set; }
+    public string Value1 { get; set; }
+    public string Value2 { get; set; }
+    public string Value3 { get; set; }
+    public string Value4 { get; set; }
+    public string Value5 { get; set; }
+    public string Value6 { get; set; }
+    public string Value7 { get; set; }
+    public string Value8 { get; set; }
+    public string Value9 { get; set; }
+    public string Value10 { get; set; }
+    public string Value11 { get; set; }
+    public string Value12 { get; set; }
+    public IPolicyValues Values { get; }
+}
+
diff --git a/Casbin/Abstractions/Persist/IPolicyFilter.cs b/Casbin/Abstractions/Persist/IPolicyFilter.cs
@@ -0,0 +1,13 @@
+using System.Linq;
+
+namespace Casbin.Persist;
+
+public interface IPolicyFilter : IPolicyFilter<IPersistantPolicy>
+{
+}
+
+public interface IPolicyFilter<T> where T : IPersistantPolicy
+{
+    public IQueryable<T> ApplyFilter(IQueryable<T> policies);
+}
+