feat: support JSON request

Signed-off-by: Taoyuesong <tao634774653@gmail.com>

Author: Taoyuesong

Casbin.UnitTests/Casbin.UnitTests.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net462;net461;net452</TargetFrameworks>
     <DebugType>full</DebugType>
     <IsPackable>false</IsPackable>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
   </PropertyGroup>
 

Casbin.UnitTests/GenericTests/GenericMatcherTest.cs

@@ -1,5 +1,7 @@
 using System;
+using Casbin.Evaluation;
 using Casbin.Model;
+using Casbin.UnitTests.Util;
 using DynamicExpresso;
 using Xunit;
 
@@ -10,37 +12,28 @@ public class GenericMatcherTest
     [Fact]
     public void TestGenericMatcher()
     {
+        Interpreter interpreter = new();
         RequestValues<string, int> r = Request.CreateValues("A", 1);
         PolicyValues<string, int> p = Policy.CreateValues("A", 1);
-        Func<RequestValues<string, int>, PolicyValues<string, int>, bool> func1 = Compile(
-            "r.Value1 == p.Value1 && r.Value2 == p.Value2",
-            nameof(r), in r, nameof(p), in p);
+        Func<RequestValues<string, int>, PolicyValues<string, int>, bool> func1 =
+            ExpressionUtil.Compile(interpreter, "r.Value1 == p.Value1 && r.Value2 == p.Value2",
+                nameof(r), in r, nameof(p), in p);
 
         Assert.True(func1(Request.CreateValues("A", 1), Policy.CreateValues("A", 1)));
         Assert.False(func1(Request.CreateValues("A", 1), Policy.CreateValues("A", 2)));
         Assert.False(func1(Request.CreateValues("B", 1), Policy.CreateValues("B", 2)));
 
         RequestValues<string, int, string> r2 = Request.CreateValues("A", 1, "read");
         PolicyValues<string, int, string> p2 = Policy.CreateValues("A", 1, "read");
-        Func<RequestValues<string, int, string>, PolicyValues<string, int, string>, bool> func2 = Compile(
-            "r2.Value1 == p2.Value1 && r2.Value2 == p2.Value2 && r2.Value3 == p2.Value3",
-            nameof(r2), in r2, nameof(p2), in p2);
+        Func<RequestValues<string, int, string>, PolicyValues<string, int, string>, bool> func2 =
+            ExpressionUtil.Compile(interpreter, "r2.Value1 == p2.Value1 && r2.Value2 == p2.Value2 && r2.Value3 == p2.Value3",
+                nameof(r2), in r2, nameof(p2), in p2);
 
         Assert.True(func2(Request.CreateValues("A", 1, "read"), Policy.CreateValues("A", 1, "read")));
         Assert.False(func2(Request.CreateValues("A", 1, "read"), Policy.CreateValues("A", 2, "read")));
         Assert.False(func2(Request.CreateValues("B", 1, "read"), Policy.CreateValues("B", 2, "read")));
     }
 
-    private static Func<TRequest, TPolicy, bool> Compile<TRequest, TPolicy>
-    (
-        string expressionText,
-        string requestType, in TRequest r,
-        string policyType, in TPolicy p)
-        where TRequest : struct, IRequestValues where TPolicy : IPolicyValues
-    {
-        Interpreter interpreter = new();
-        return interpreter.ParseAsDelegate<Func<TRequest, TPolicy, bool>>(
-            expressionText, requestType, policyType
-        );
-    }
+
+
 }

Casbin/Abstractions/IEnforcer.cs

@@ -81,6 +81,7 @@ public BatchEnforceAsyncResults BatchEnforceAsync<TRequest>(EnforceContext conte
         public bool AutoBuildRoleLinks { get; set; }
         public bool AutoNotifyWatcher { get; set; }
         public bool AutoCleanEnforceCache { get; set; }
+        public bool AcceptJsonRequest { get; set; }
 
         #endregion
 

Casbin/EnforceOptions.cs

@@ -11,6 +11,8 @@ public class EnforcerOptions
     public bool AutoCleanEnforceCache { get; set; } = true;
     public bool AutoLoadPolicy { get; set; } = true;
     public IPolicyFilter AutoLoadPolicyFilter { get; set; } = null;
+
+    public bool AcceptJsonRequest { get; set; } = false;
 }
 
 

Casbin/EnforceView.cs

@@ -127,13 +127,11 @@ public static string TransformMatcher(in EnforceView view, string matcher)
                     Regex reg = new Regex(perfix + $@"{view.RequestType}\.{tokenPair.Key}" + suffix);
                     matcher = reg.Replace(matcher, $"{view.RequestType}[{tokenPair.Value}]");
                 }
-
                 foreach (KeyValuePair<string, int> tokenPair in view.PolicyAssertion.Tokens)
                 {
                     Regex reg = new Regex(perfix + $@"{view.PolicyType}\.{tokenPair.Key}" + suffix);
                     matcher = reg.Replace(matcher, $"{view.PolicyType}[{tokenPair.Value}]");
                 }
-
                 return matcher;
             }
 
@@ -142,13 +140,11 @@ public static string TransformMatcher(in EnforceView view, string matcher)
                 Regex reg = new Regex(perfix + $@"{view.RequestType}\.{tokenPair.Key}" + suffix);
                 matcher = reg.Replace(matcher, $"{view.RequestType}.Value{tokenPair.Value + 1}");
             }
-
             foreach (KeyValuePair<string, int> tokenPair in view.PolicyAssertion.Tokens)
             {
                 Regex reg = new Regex(perfix + $@"{view.PolicyType}\.{tokenPair.Key}" + suffix);
                 matcher = reg.Replace(matcher, $"{view.PolicyType}.Value{tokenPair.Value + 1}");
             }
-
             return matcher;
         }
     }

Casbin/Enforcer.cs

@@ -36,6 +36,7 @@ public Enforcer(IModel model, IReadOnlyAdapter adapter = default, EnforcerOption
             AutoNotifyWatcher = options.AutoNotifyWatcher;
             AutoBuildRoleLinks = options.AutoBuildRoleLinks;
             AutoCleanEnforceCache = options.AutoCleanEnforceCache;
+            AcceptJsonRequest = options.AcceptJsonRequest;
 
             this.SetModel(model);
             if (adapter is not null)
@@ -65,6 +66,7 @@ public Enforcer(IModel model, IReadOnlyAdapter adapter = default, EnforcerOption
         public bool AutoBuildRoleLinks { get; set; }
         public bool AutoNotifyWatcher { get; set; }
         public bool AutoCleanEnforceCache { get; set; }
+        public bool AcceptJsonRequest { get; set; }
 
         #endregion
 

Casbin/Extensions/Enforcer/EnforcerExtension.cs

@@ -94,6 +94,18 @@ public static IEnforcer EnableAutoCleanEnforceCache(this IEnforcer enforcer, boo
             return enforcer;
         }
 
+        /// <summary>
+        /// EnableAcceptJsonRequest controls whether to accept json as a request parameter
+        /// </summary>
+        /// <param name="enforcer"></param>
+        /// <param name="acceptJsonRequest"></param>
+        /// <returns></returns>
+        public static IEnforcer EnableAcceptJsonRequest(this IEnforcer enforcer, bool acceptJsonRequest)
+        {
+            enforcer.AcceptJsonRequest = acceptJsonRequest;
+            return enforcer;
+        }
+
         #endregion
 
         #region Set extensions

Casbin/Extensions/Enforcer/ManagementEnforcerExtension.cs

@@ -14,17 +14,14 @@ public static class ManagementEnforcerExtension
         /// <param name="enforcer"></param>
         /// <param name="name">The name of the new function.</param>
         /// <param name="function">The function.</param>
-        public static void AddFunction(this IEnforcer enforcer, string name, Delegate function) =>
+        public static void AddFunction<T>(this IEnforcer enforcer, string name, T function) where T : Delegate
+        {
             enforcer.Model.ExpressionHandler.SetFunction(name, function);
-
-        /// <summary>
-        ///     Adds a customized function.
-        /// </summary>
-        /// <param name="enforcer"></param>
-        /// <param name="name">The name of the new function.</param>
-        /// <param name="function">The function.</param>
-        public static void AddFunction(this IEnforcer enforcer, string name, Func<string, string, bool> function) =>
-            AddFunction(enforcer, name, (Delegate)function);
+            if (enforcer.AutoCleanEnforceCache)
+            {
+                enforcer.ClearCache();
+            }
+        }
 
         #region "p" (Store) Management