From 9379fba2cd42d421827c4b41c97bc29b98ddd4e3 Mon Sep 17 00:00:00 2001 From: Zach Redinger <72579339+zredinger-ccc@users.noreply.github.com> Date: Fri, 8 Mar 2024 20:16:25 -0600 Subject: [PATCH] feat: fix call to AddDomainMatchingFunc() (#345) * fix: Fix misspelling from Manger -> Manager * fix: AddNamedDomainMatchingFunc not adding to domain matcher --- Casbin.UnitTests/Util/TestUtil.cs | 22 ++++++------- .../Extensions/Enforcer/EnforcerExtension.cs | 6 ++-- .../Enforcer/InternalEnforcerExtension.cs | 32 +++++++++---------- .../Enforcer/RbacEnforcerExtension.cs | 14 ++++---- Casbin/Extensions/Model/ModelExtension.cs | 4 +-- ...erExtension.cs => RoleManagerExtension.cs} | 2 +- 6 files changed, 40 insertions(+), 40 deletions(-) rename Casbin/Extensions/Rbac/{RoleMangerExtension.cs => RoleManagerExtension.cs} (92%) diff --git a/Casbin.UnitTests/Util/TestUtil.cs b/Casbin.UnitTests/Util/TestUtil.cs index ae3e9a09..5b014dec 100644 --- a/Casbin.UnitTests/Util/TestUtil.cs +++ b/Casbin.UnitTests/Util/TestUtil.cs @@ -32,7 +32,7 @@ internal static void TestBatchEnforce(IEnforcer e, IEnumerable<(T, bool)> val internal static void TestParallelBatchEnforce(Enforcer e, IEnumerable<(T, bool)> values) where T : IRequestValues => Assert.True(values.Select(x => x.Item2).SequenceEqual(e.ParallelBatchEnforce(values.Select(x => x.Item1).ToList()))); - internal static async void TestBatchEnforceAsync(IEnforcer e, IEnumerable<(T, bool)> values) where T : IRequestValues + internal static async void TestBatchEnforceAsync(IEnforcer e, IEnumerable<(T, bool)> values) where T : IRequestValues { #if !NET452 var res = e.BatchEnforceAsync(values.Select(x => x.Item1)); @@ -42,7 +42,7 @@ internal static async void TestBatchEnforceAsync(IEnforcer e, IEnumerable<(T, var expectedResults = values.Select(x => x.Item2); var expectedResultEnumerator = expectedResults.GetEnumerator(); #if !NET452 - await foreach(var item in res) + await foreach (var item in res) #else foreach(var item in res) #endif @@ -60,17 +60,17 @@ internal static void TestEnforceWithMatcher(this IEnforcer e, string internal static async Task TestEnforceWithMatcherAsync(this IEnforcer e, string matcher, T1 sub, T2 obj, T3 act, bool res) => Assert.Equal(res, await e.EnforceWithMatcherAsync(matcher, sub, obj, act)); - - internal static void TestBatchEnforceWithMatcher(this IEnforcer e, string matcher, IEnumerable<(T, bool)> values) - where T : IRequestValues => + + internal static void TestBatchEnforceWithMatcher(this IEnforcer e, string matcher, IEnumerable<(T, bool)> values) + where T : IRequestValues => Assert.True(values.Select(x => x.Item2).SequenceEqual(e.BatchEnforceWithMatcher(matcher, values.Select(x => x.Item1)))); - internal static void TestBatchEnforceWithMatcherParallel(this Enforcer e, string matcher, IEnumerable<(T, bool)> values) - where T : IRequestValues => + internal static void TestBatchEnforceWithMatcherParallel(this Enforcer e, string matcher, IEnumerable<(T, bool)> values) + where T : IRequestValues => Assert.True(values.Select(x => x.Item2).SequenceEqual(e.BatchEnforceWithMatcherParallel(matcher, values.Select(x => x.Item1).ToList()))); - internal static async void TestBatchEnforceWithMatcherAsync(IEnforcer e, string matcher, IEnumerable<(T, bool)> values) - where T : IRequestValues + internal static async void TestBatchEnforceWithMatcherAsync(IEnforcer e, string matcher, IEnumerable<(T, bool)> values) + where T : IRequestValues { #if !NET452 var res = e.BatchEnforceWithMatcherAsync(matcher, values.Select(x => x.Item1)); @@ -80,7 +80,7 @@ internal static async void TestBatchEnforceWithMatcherAsync(IEnforcer e, stri var expectedResults = values.Select(x => x.Item2); var expectedResultEnumerator = expectedResults.GetEnumerator(); #if !NET452 - await foreach(var item in res) + await foreach (var item in res) #else foreach(var item in res) #endif @@ -248,7 +248,7 @@ internal static void TestGetPermissionsInDomain(IEnforcer e, string name, string internal delegate IEnumerable GetAllList(); - #region RoleManger test + #region RoleManager test internal static void TestRole(IRoleManager roleManager, string name1, string name2, bool expectResult) { diff --git a/Casbin/Extensions/Enforcer/EnforcerExtension.cs b/Casbin/Extensions/Enforcer/EnforcerExtension.cs index d10da871..a5b0880f 100644 --- a/Casbin/Extensions/Enforcer/EnforcerExtension.cs +++ b/Casbin/Extensions/Enforcer/EnforcerExtension.cs @@ -328,7 +328,7 @@ public static void BuildRoleLinks(this IEnforcer enforcer) } public static IRoleManager GetRoleManager(this IEnforcer enforcer, string roleType) => - enforcer.Model.GetRoleManger(roleType); + enforcer.Model.GetRoleManager(roleType); public static void SetRoleManager(this IEnforcer enforcer, IRoleManager roleManager) => enforcer.SetRoleManager(PermConstants.DefaultRoleType, roleManager); @@ -355,13 +355,13 @@ public static void AddDomainMatchingFunc(this IEnforcer enforcer, Func func) { - enforcer.Model.GetRoleManger(roleType).AddMatchingFunc(func); + enforcer.Model.GetRoleManager(roleType).AddMatchingFunc(func); } public static void AddNamedDomainMatchingFunc(this IEnforcer enforcer, string roleType, Func func) { - enforcer.Model.GetRoleManger(roleType).AddMatchingFunc(func); + enforcer.Model.GetRoleManager(roleType).AddDomainMatchingFunc(func); } #endregion diff --git a/Casbin/Extensions/Enforcer/InternalEnforcerExtension.cs b/Casbin/Extensions/Enforcer/InternalEnforcerExtension.cs index 65f72944..f8e1433f 100644 --- a/Casbin/Extensions/Enforcer/InternalEnforcerExtension.cs +++ b/Casbin/Extensions/Enforcer/InternalEnforcerExtension.cs @@ -46,7 +46,7 @@ internal static bool InternalHasPolicies(this IEnforcer enforcer, string section internal static bool InternalAddPolicy(this IEnforcer enforcer, string section, string policyType, IPolicyValues values) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); bool ruleAdded = policyManager.AddPolicy(values); if (ruleAdded is false) @@ -69,13 +69,13 @@ internal static bool InternalAddPolicy(this IEnforcer enforcer, string section, internal static async Task InternalAddPolicyAsync(this IEnforcer enforcer, string section, string policyType, IPolicyValues values) { - IPolicyManager policyManger = enforcer.Model.GetPolicyManger(section, policyType); - if (policyManger.HasPolicy(values)) + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); + if (policyManager.HasPolicy(values)) { return false; } - bool ruleAdded = await policyManger.AddPolicyAsync(values); + bool ruleAdded = await policyManager.AddPolicyAsync(values); if (ruleAdded is false) { @@ -97,7 +97,7 @@ internal static async Task InternalAddPolicyAsync(this IEnforcer enforcer, internal static bool InternalAddPolicies(this IEnforcer enforcer, string section, string policyType, IReadOnlyList valuesList) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicies(valuesList)) { return false; @@ -126,7 +126,7 @@ internal static bool InternalAddPolicies(this IEnforcer enforcer, string section internal static async Task InternalAddPoliciesAsync(this IEnforcer enforcer, string section, string policyType, IReadOnlyList valuesList) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicies(valuesList)) { return false; @@ -156,7 +156,7 @@ await OnPolicyAsyncChanged(enforcer, internal static bool InternalUpdatePolicy(this IEnforcer enforcer, string section, string policyType, IPolicyValues oldValues, IPolicyValues newValues) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicy(oldValues) is false) { return false; @@ -186,7 +186,7 @@ internal static bool InternalUpdatePolicy(this IEnforcer enforcer, string sectio internal static async Task InternalUpdatePolicyAsync(this IEnforcer enforcer, string section, string policyType, IPolicyValues oldValues, IPolicyValues newValues) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicy(oldValues) is false) { return false; @@ -216,7 +216,7 @@ await OnPolicyAsyncChanged(enforcer, internal static bool InternalUpdatePolicies(this IEnforcer enforcer, string section, string policyType, IReadOnlyList oldValuesList, IReadOnlyList newValuesList) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasAllPolicies(oldValuesList) is false) { return false; @@ -246,7 +246,7 @@ internal static bool InternalUpdatePolicies(this IEnforcer enforcer, string sect internal static async Task InternalUpdatePoliciesAsync(this IEnforcer enforcer, string section, string policyType, IReadOnlyList oldValuesList, IReadOnlyList newValuesList) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasAllPolicies(oldValuesList) is false) { return false; @@ -275,7 +275,7 @@ await OnPolicyAsyncChanged(enforcer, internal static bool InternalRemovePolicy(this IEnforcer enforcer, string section, string policyType, IPolicyValues values) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicy(values) is false) { return false; @@ -303,7 +303,7 @@ internal static bool InternalRemovePolicy(this IEnforcer enforcer, string sectio internal static async Task InternalRemovePolicyAsync(this IEnforcer enforcer, string section, string policyType, IPolicyValues rule) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicy(rule) is false) { return false; @@ -331,7 +331,7 @@ internal static async Task InternalRemovePolicyAsync(this IEnforcer enforc internal static bool InternalRemovePolicies(this IEnforcer enforcer, string section, string policyType, IReadOnlyList rules) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicies(rules) is false) { return false; @@ -359,7 +359,7 @@ internal static bool InternalRemovePolicies(this IEnforcer enforcer, string sect internal static async Task InternalRemovePoliciesAsync(this IEnforcer enforcer, string section, string policyType, IReadOnlyList rules) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); if (policyManager.HasPolicies(rules) is false) { return false; @@ -389,7 +389,7 @@ await OnPolicyAsyncChanged(enforcer, internal static bool InternalRemoveFilteredPolicy(this IEnforcer enforcer, string section, string policyType, int fieldIndex, IPolicyValues fieldValues) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); IEnumerable effectPolicies = policyManager.RemoveFilteredPolicy(fieldIndex, fieldValues); if (effectPolicies is null) @@ -416,7 +416,7 @@ internal static bool InternalRemoveFilteredPolicy(this IEnforcer enforcer, strin internal static async Task InternalRemoveFilteredPolicyAsync(this IEnforcer enforcer, string section, string policyType, int fieldIndex, IPolicyValues fieldValues) { - IPolicyManager policyManager = enforcer.Model.GetPolicyManger(section, policyType); + IPolicyManager policyManager = enforcer.Model.GetPolicyManager(section, policyType); IEnumerable effectPolicies = await policyManager.RemoveFilteredPolicyAsync(fieldIndex, fieldValues); diff --git a/Casbin/Extensions/Enforcer/RbacEnforcerExtension.cs b/Casbin/Extensions/Enforcer/RbacEnforcerExtension.cs index f899665d..98211216 100644 --- a/Casbin/Extensions/Enforcer/RbacEnforcerExtension.cs +++ b/Casbin/Extensions/Enforcer/RbacEnforcerExtension.cs @@ -55,8 +55,8 @@ domain is null public static IEnumerable GetRolesForUser(this IEnforcer enforcer, string name, string domain = null) { return domain is null - ? enforcer.Model.GetRoleManger().GetRoles(name) - : enforcer.Model.GetRoleManger().GetRoles(name, domain); + ? enforcer.Model.GetRoleManager().GetRoles(name) + : enforcer.Model.GetRoleManager().GetRoles(name, domain); } /// @@ -69,8 +69,8 @@ public static IEnumerable GetRolesForUser(this IEnforcer enforcer, strin public static IEnumerable GetUsersForRole(this IEnforcer enforcer, string name, string domain = null) { return domain is null - ? enforcer.Model.GetRoleManger().GetUsers(name) - : enforcer.Model.GetRoleManger().GetUsers(name, domain); + ? enforcer.Model.GetRoleManager().GetUsers(name) + : enforcer.Model.GetRoleManager().GetUsers(name, domain); } /// @@ -95,7 +95,7 @@ public static IEnumerable GetUsersForRoles(this IEnforcer enforcer, IEnu var userIds = new List(); foreach (string name in names) { - userIds.AddRange(enforcer.Model.GetRoleManger().GetUsers(name)); + userIds.AddRange(enforcer.Model.GetRoleManager().GetUsers(name)); } return userIds; @@ -649,7 +649,7 @@ public static IEnumerable GetDomainsForUser(this IEnforcer enforcer, str string roleType = null) { roleType ??= PermConstants.DefaultRoleType; - return enforcer.Model.GetRoleManger(roleType).GetDomains(name); + return enforcer.Model.GetRoleManager(roleType).GetDomains(name); } /// @@ -661,7 +661,7 @@ public static IEnumerable GetDomainsForUser(this IEnforcer enforcer, str /// public static IEnumerable GetRolesForUserInDomain(this IEnforcer enforcer, string name, string domain) => - enforcer.Model.GetRoleManger().GetRoles(name, domain); + enforcer.Model.GetRoleManager().GetRoles(name, domain); /// /// diff --git a/Casbin/Extensions/Model/ModelExtension.cs b/Casbin/Extensions/Model/ModelExtension.cs index 08abae3c..e36b5a07 100644 --- a/Casbin/Extensions/Model/ModelExtension.cs +++ b/Casbin/Extensions/Model/ModelExtension.cs @@ -205,12 +205,12 @@ public static void SetAutoSave(this IModel model, bool autoSave) } } - public static IPolicyManager GetPolicyManger(this IModel model, string section, + public static IPolicyManager GetPolicyManager(this IModel model, string section, string policyType = PermConstants.DefaultPolicyType) => model.Sections.GetPolicyAssertion(section, policyType).PolicyManager; public static IRoleManager - GetRoleManger(this IModel model, string roleType = PermConstants.DefaultRoleType) => + GetRoleManager(this IModel model, string roleType = PermConstants.DefaultRoleType) => model.Sections.GetRoleAssertion(roleType).RoleManager; public static void SetRoleManager(this IModel model, string roleType, IRoleManager roleManager) diff --git a/Casbin/Extensions/Rbac/RoleMangerExtension.cs b/Casbin/Extensions/Rbac/RoleManagerExtension.cs similarity index 92% rename from Casbin/Extensions/Rbac/RoleMangerExtension.cs rename to Casbin/Extensions/Rbac/RoleManagerExtension.cs index a2a88d3f..8ae8de13 100644 --- a/Casbin/Extensions/Rbac/RoleMangerExtension.cs +++ b/Casbin/Extensions/Rbac/RoleManagerExtension.cs @@ -3,7 +3,7 @@ namespace Casbin { - public static class RoleMangerExtension + public static class RoleManagerExtension { public static IRoleManager AddMatchingFunc(this IRoleManager roleManager, Func matchingFunc)