Merge pull request #79 from nodece/master

Improve matcher escaping

src/model/model.ts

@@ -79,22 +79,40 @@ export class Model {
 
     if (sec === 'r' || sec === 'p') {
       const tokens = value.split(', ');
+
       for (let i = 0; i < tokens.length; i++) {
         tokens[i] = key + '_' + tokens[i];
       }
+
       ast.tokens = tokens;
+    } else if (sec === 'm') {
+      const stringArguments = value.match(/\"(.*?)\"/g) || [];
+
+      stringArguments.forEach((n, index) => {
+        value = value.replace(n, `$<${index}>`);
+      });
+
+      value = util.removeComments(util.escapeAssertion(value));
+
+      stringArguments.forEach((n, index) => {
+        value = value.replace(`$<${index}>`, n);
+      });
+
+      ast.value = value;
     } else {
       ast.value = util.removeComments(util.escapeAssertion(value));
     }
 
     const nodeMap = this.model.get(sec);
+
     if (nodeMap) {
       nodeMap.set(key, ast);
     } else {
       const assertionMap = new Map<string, Assertion>();
       assertionMap.set(key, ast);
       this.model.set(sec, assertionMap);
     }
+
     return true;
   }
 

test/model.test.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import * as _ from 'lodash';
-import { newEnforcer, Enforcer } from '../src';
+import { newEnforcer, Enforcer, newModel } from '../src';
 
 async function testEnforce(e: Enforcer, sub: string, obj: any, act: string, res: boolean) {
   await expect(e.enforce(sub, obj, act)).resolves.toBe(res);
@@ -274,3 +274,11 @@ test('TestPriorityModelIndeterminate', async () => {
 
   await testEnforce(e, 'alice', 'data1', 'read', false);
 });
+
+test('TestMatcher', async () => {
+  const m = newModel();
+
+  m.addDef('m', 'm', 'keyMatch(r.obj, ".*get$") || regexMatch(r.act, ".user.")');
+
+  expect(m.model.get('m')!.get('m')!.value).toEqual(`keyMatch(r_obj, ".*get$") || regexMatch(r_act, ".user.")`);
+});