fix: Revert "fix: escape assertion bug (#394)" (#398)

This reverts commit 5a339d8.
casbin · Nov 12, 2022 · 6127584 · 6127584
1 parent e3b23b8
commit 6127584
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 31 deletions.
diff --git a/examples/abac_attr_model.conf b/examples/abac_attr_model.conf
diff --git a/examples/abac_attr_policy.csv b/examples/abac_attr_policy.csv
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -17,10 +17,8 @@ import * as fs from 'fs';
 // escapeAssertion escapes the dots in the assertion,
 // because the expression evaluation doesn't support such variable names.
 function escapeAssertion(s: string): string {
-  s = ' ' + s;
-  s = s.replace(/(?<=[\(| ])r\./g, 'r_');
-  s = s.replace(/(?<=[\(| ])p\./g, 'p_');
-  s = s.trim();
+  s = s.replace(/r\./g, 'r_');
+  s = s.replace(/p\./g, 'p_');
   return s;
 }
 

diff --git a/test/enforcer.test.ts b/test/enforcer.test.ts
@@ -697,17 +697,3 @@ test('TestEnforceExWithPriorityModel', async () => {
   testEnforceEx(e, 'bob', 'data2', 'read', [true, ['data2_allow_group', 'data2', 'read', 'allow']]);
   testEnforceEx(e, 'alice', 'data2', 'read', [false, []]);
 });
-
-test('TestABACAtrrModel', async () => {
-  const e = await newEnforcer('examples/abac_attr_model.conf', 'examples/abac_attr_policy.csv');
-  expect(
-    await e.enforce(
-      {
-        attr: {
-          id: 'alice',
-        },
-      },
-      'read'
-    )
-  ).toBe(true);
-});