fix: Not use ref values to transform

Signed-off-by: sagilio <sagilio@outlook.com>
casbin-net · Apr 1, 2023 · 6a397ff · 6a397ff
1 parent 85ad73c
commit 6a397ff
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 21 deletions.
diff --git a/samples/WebApplicationSample/CasbinConfigs/basic_policy.csv b/samples/WebApplicationSample/CasbinConfigs/basic_policy.csv
@@ -2,7 +2,7 @@
 p, alice@example.com, BasicTest, Get
 
 # Policy below will only match if using the CustomRequestTransformer
-p, alice@example.com, /attribtest, GET
+p, alice@example.com, /AttributeTest, GET
 
 # Policy below will only match if using the CustomRequestTransformer
 #p, alice@example.com, /home/privacy, GET
diff --git a/samples/WebApplicationSample/Controllers/HomeController.cs b/samples/WebApplicationSample/Controllers/HomeController.cs
@@ -22,14 +22,14 @@ public IActionResult Index()
             return View();
         }
 
-        [HttpGet("attribtest")]
-        [CasbinAuthorize]
-        public IActionResult AttribRouteTest(string tenantId)
+        [HttpGet("AttributeTest")]
+        [CasbinAuthorize(RequestTransformerType = typeof(KeyMatchRequestTransformer))]
+        public IActionResult AttributeTest(string tenantId)
         {
             return View();
         }
 
-        [CasbinAuthorize(nameof(BasicTest), nameof(HttpMethod.Get))]
+        [CasbinAuthorize(nameof(BasicTest), nameof(HttpMethod.Get), RequestTransformerType = typeof(BasicRequestTransformer))]
         public IActionResult BasicTest()
         {
             return View();

diff --git a/samples/WebApplicationSample/Views/Home/AttribRouteTest.cshtml b/samples/WebApplicationSample/Views/Home/AttribRouteTest.cshtml
diff --git a/samples/WebApplicationSample/Views/Home/AttributeTest.cshtml b/samples/WebApplicationSample/Views/Home/AttributeTest.cshtml
diff --git a/samples/WebApplicationSample/Views/Home/Index.cshtml b/samples/WebApplicationSample/Views/Home/Index.cshtml
@@ -4,6 +4,6 @@
 
 <div class="text-center">
     <h1 class="display-4">Welcome</h1>
-    <p>Basic Model : Policy is "p, alice@example.com, BasicTest, GET" - <a asp-controller="Home" asp-action="BasicTest">Test</a>.</p>
-    <p>Attrib Route : Policy is "p, alice@example.com, /attribtest, GET" - <a asp-controller="Home" asp-action="AttribRouteTest">Attribute Route Test</a>.</p>
+    <p>Basic Model : Policy is "p, alice@example.com, BasicTest, GET" - <a asp-controller="Home" asp-action="BasicTest">Basic Test</a>.</p>
+    <p>Attrib Route : Policy is "p, alice@example.com, /Attribute, GET" - <a asp-controller="Home" asp-action="AttributeTest">Attribute Test</a>.</p>
 </div>
diff --git a/src/Casbin.AspNetCore.Core/Transformers/BasicRequestTransformer.cs b/src/Casbin.AspNetCore.Core/Transformers/BasicRequestTransformer.cs
@@ -16,13 +16,13 @@ public override ValueTask<StringRequestValues> TransformAsync(
             ICasbinAuthorizationContext<StringRequestValues> context,
             ICasbinAuthorizationData<StringRequestValues> data)
         {
-            ref var values = ref data.Values;
+            var values = data.Values;
             string? value1 = values.Value1;
             string? value2 = values.Value2;
             values.TrySetValue(0, SubTransform(context, data));
             values.TrySetValue(1, value1);
             values.TrySetValue(2, value2);
-            return new ValueTask<StringRequestValues>(data.Values);
+            return new ValueTask<StringRequestValues>(values);
         }
 
         protected virtual string SubTransform<TRequest>(ICasbinAuthorizationContext<TRequest> context, ICasbinAuthorizationData<TRequest> data)

diff --git a/src/Casbin.AspNetCore.Core/Transformers/KeyMatchRequestTransformer.cs b/src/Casbin.AspNetCore.Core/Transformers/KeyMatchRequestTransformer.cs
@@ -10,11 +10,11 @@ public override ValueTask<StringRequestValues> TransformAsync(
             ICasbinAuthorizationContext<StringRequestValues> context,
             ICasbinAuthorizationData<StringRequestValues> data)
         {
-            ref var values = ref data.Values;
+            var values = data.Values;
             values.TrySetValue(0, SubTransform(context, data));
             values.TrySetValue(1, context.HttpContext.Request.Path.Value);
             values.TrySetValue(2, context.HttpContext.Request.Method);
-            return new ValueTask<StringRequestValues>(data.Values);
+            return new ValueTask<StringRequestValues>(values);
         }
     }
 }
diff --git a/src/Casbin.AspNetCore.Core/Transformers/RbacRequestTransformer.cs b/src/Casbin.AspNetCore.Core/Transformers/RbacRequestTransformer.cs
@@ -14,15 +14,15 @@ public override ValueTask<StringRequestValues> TransformAsync(
             ICasbinAuthorizationContext<StringRequestValues> context,
             ICasbinAuthorizationData<StringRequestValues> data)
         {
-            ref var values = ref data.Values;
+            var values = data.Values;
             string? value1 = values.Value1;
             string? value2 = values.Value2;
             string? value3 = values.Value3;
             values.TrySetValue(0, SubTransform(context, data));
             values.TrySetValue(1, value1);
             values.TrySetValue(2, value2);
             values.TrySetValue(3, value3);
-            return new ValueTask<StringRequestValues>(data.Values);
+            return new ValueTask<StringRequestValues>(values);
         }
     }
 }