fix: Interrupt policy scanner at final block (#362)

Signed-off-by: Taoyuesong <[email protected]>
casbin · Aug 11, 2024 · 91904e9 · 91904e9
1 parent 6863c41
commit 91904e9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/Casbin/Enforcer.Internal.cs b/Casbin/Enforcer.Internal.cs
@@ -82,32 +82,39 @@ private bool InternalEnforce<TRequest, TPolicy>(in EnforceContext context, in TR
 
         if (context.View.HasPolicyParameter && session.HasNextPolicy)
         {
-            int policyIndex = 0;
-            while (scanner.GetNext(out IPolicyValues outValues))
+            try
             {
-                TPolicy policyValues = (TPolicy)outValues;
-                session.PolicyIndex = policyIndex;
-
-                HandleBeforeExpression(in context, ref session, in effectChain, in requestValues, policyValues);
-                session.ExpressionResult = expressionHandler.Invoke(in context, session.ExpressionString,
-                    in requestValues, in policyValues);
-
-                if (session.IsChainEffector)
-                {
-                    HandleExpressionResult(in context, ref session, ref effectChain, in requestValues, policyValues);
-                }
-                else
-                {
-                    HandleExpressionResult(in context, ref session, Effector, in requestValues, policyValues);
-                }
-
-                if (session.Determined)
+                int policyIndex = 0;
+                while (scanner.GetNext(out IPolicyValues outValues))
                 {
-                    scanner.Interrupt();
-                    break;
+                    TPolicy policyValues = (TPolicy)outValues;
+                    session.PolicyIndex = policyIndex;
+
+                    HandleBeforeExpression(in context, ref session, in effectChain, in requestValues, policyValues);
+                    session.ExpressionResult = expressionHandler.Invoke(in context, session.ExpressionString,
+                        in requestValues, in policyValues);
+
+                    if (session.IsChainEffector)
+                    {
+                        HandleExpressionResult(in context, ref session, ref effectChain, in requestValues, policyValues);
+                    }
+                    else
+                    {
+                        HandleExpressionResult(in context, ref session, Effector, in requestValues, policyValues);
+                    }
+
+                    if (session.Determined)
+                    {
+                        scanner.Interrupt();
+                        break;
+                    }
+
+                    policyIndex++;
                 }
-
-                policyIndex++;
+            }
+            finally
+            {
+                scanner.Interrupt();
             }
         }
         else

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }
-}
+}