fix: Ensure tab characters in policy files are parsed as white-space (#…

…324) * fix: Ensure tab characters in policy files are parsed as white-space * tests: Add unit tests
casbin · Aug 4, 2023 · 766bf05 · 766bf05
1 parent 9be6024
commit 766bf05
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 7 deletions.
diff --git a/Casbin.UnitTests/Fixtures/TestModelFixture.cs b/Casbin.UnitTests/Fixtures/TestModelFixture.cs
@@ -31,6 +31,8 @@ public class TestModelFixture
     //https://github.com/casbin/Casbin.NET/issues/310
     internal readonly string _commaAndQuotationsModelText = ReadTestFile("comma_quotations_model.conf");
     internal readonly string _commaAndQuotationsPolicyText = ReadTestFile("comma_quotations_policy.csv");
+    internal readonly string _tabsModelText = ReadTestFile("tabs_model.conf");
+    internal readonly string _tabsPolicyText = ReadTestFile("tabs_policy.csv");
     internal readonly string _ipMatchModelText = ReadTestFile("ipmatch_model.conf");
     internal readonly string _ipMatchPolicyText = ReadTestFile("ipmatch_policy.csv");
     internal readonly string _keyMatch2ModelText = ReadTestFile("keymatch2_model.conf");
@@ -152,6 +154,9 @@ public IModel GetNewRbacWithResourceRoleTestModel() =>
     public IModel GetNewCommaAndQuotationsModel() =>
         GetNewTestModel(_commaAndQuotationsModelText, _commaAndQuotationsPolicyText);
 
+    public IModel GetNewTabsModel() =>
+        GetNewTestModel(_tabsModelText, _tabsPolicyText);
+
     public static IModel GetNewTestModel(string modelText) => DefaultModel.CreateFromText(modelText);
 
     public static IModel GetNewTestModel(string modelText, string policyText) =>

diff --git a/Casbin.UnitTests/ModelTests/ModelTest.cs b/Casbin.UnitTests/ModelTests/ModelTest.cs
@@ -644,6 +644,15 @@ public void TestModelWithCommaAndQuotations()
         TestEnforce(e, "cindy", "\"\"Muti Quotations Test\"", "Get", false);
     }
 
+    [Fact]
+    public void TestModelWithTabs()
+    {
+        Enforcer e = new Enforcer(_testModelFixture.GetNewTabsModel());
+        e.AddRoleForUserInDomain("/user/john", "admin", "/tenant/1");
+
+        Assert.True(e.Enforce("/user/john", "/tenant/1", "/tenant/1/resource", "Write"));
+    }
+
     [Fact]
     public void TestRbacTokensWithSubstringRelation()
     {

diff --git a/Casbin.UnitTests/examples/tabs_model.conf b/Casbin.UnitTests/examples/tabs_model.conf
@@ -0,0 +1,15 @@
+[request_definition]
+r = a, b, c, d
+
+[policy_definition]
+p = a, b, c, d
+#p = wallet, ecosystem, resource, action
+
+[role_definition]
+g = _, _, _
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = (keyMatch2(r.a, p.a) || g(r.a, p.a, r.b)) && keyMatch2(r.c, p.c) && keyMatch(r.d, p.d) && keyMatch2(r.b, p.b) && keyGet2(r.b, p.b, "id") == keyGet2(r.c, p.c, "id")
diff --git a/Casbin.UnitTests/examples/tabs_policy.csv b/Casbin.UnitTests/examples/tabs_policy.csv
@@ -0,0 +1 @@
+p,  admin,	    /tenant/:id,        /tenant/:id/*,                          *
diff --git a/Casbin/Extensions/Persist/PolicyStoreExtension.cs b/Casbin/Extensions/Persist/PolicyStoreExtension.cs
@@ -29,7 +29,8 @@ public static bool TryLoadPolicyLine(this IPolicyStore store, string line)
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
         if (parser.Read() is false)
         {

diff --git a/Casbin/Persist/Adapter/File/FileAdapter.cs b/Casbin/Persist/Adapter/File/FileAdapter.cs
@@ -266,7 +266,8 @@ private static IEnumerable<IPersistPolicy> ReadPersistPolicy(string filePath)
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
 
         while (parser.Read())
@@ -293,7 +294,8 @@ private static IEnumerable<IPersistPolicy> ReadPersistPolicy(System.IO.Stream st
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
 
         while (parser.Read())
@@ -327,7 +329,8 @@ private static async IAsyncEnumerable<IPersistPolicy> ReadPersistPolicyAsync(str
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
 
         while (await parser.ReadAsync())
@@ -355,7 +358,8 @@ private static async Task<IEnumerable<IPersistPolicy>> ReadPersistPolicyAsync(st
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
         var list = new List<PersistPolicy>();
         while (await parser.ReadAsync())
@@ -386,7 +390,8 @@ private static async IAsyncEnumerable<IPersistPolicy> ReadPersistPolicyAsync(Sys
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
 
         while (await parser.ReadAsync())
@@ -413,7 +418,8 @@ private static async Task<IEnumerable<IPersistPolicy>> ReadPersistPolicyAsync(Sy
                 HasHeaderRecord = false,
                 TrimOptions = TrimOptions.Trim,
                 IgnoreBlankLines = true,
-                BadDataFound = null
+                BadDataFound = null,
+                WhiteSpaceChars = new []{' ', '\t'}
             });
         var list = new List<PersistPolicy>();
         while (await parser.ReadAsync())