casbin 5.25.0 → 5.26.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [5.26.0](https://github.com/casbin/node-casbin/compare/v5.25.0...v5.26.0) (2023-03-26)
+
+
+### Features
+
+* Multiple sections type ([#442](https://github.com/casbin/node-casbin/issues/442)) ([48b0d8f](https://github.com/casbin/node-casbin/commit/48b0d8fbbf302f61aed20bb6d0f2354354df9941))
+
 # [5.25.0](https://github.com/casbin/node-casbin/compare/v5.24.4...v5.25.0) (2023-03-20)
 
 

package/examples/mulitple_policy.csv

@@ -0,0 +1,2 @@
+p2, alice, data1, read
+p2, bob, data2, write

package/lib/cjs/coreEnforcer.d.ts

@@ -13,6 +13,7 @@ export declare class CoreEnforcer {
     protected fm: FunctionMap;
     protected eft: Effector;
     private matcherMap;
+    private defaultEnforceContext;
     protected adapter: UpdatableAdapter | FilteredAdapter | Adapter | BatchAdapter;
     protected watcher: Watcher | null;
     protected watcherEx: WatcherEx | null;

package/lib/cjs/coreEnforcer.js

@@ -18,6 +18,7 @@ const expression_eval_1 = require("expression-eval");
 const effect_1 = require("./effect");
 const model_1 = require("./model");
 const rbac_1 = require("./rbac");
+const enforceContext_1 = require("./enforceContext");
 const util_1 = require("./util");
 const log_1 = require("./log");
 /**
@@ -28,6 +29,7 @@ class CoreEnforcer {
         this.fm = model_1.FunctionMap.loadFunctionMap();
         this.eft = new effect_1.DefaultEffector();
         this.matcherMap = new Map();
+        this.defaultEnforceContext = new enforceContext_1.EnforceContext('r', 'p', 'e', 'm');
         this.watcher = null;
         this.watcherEx = null;
         this.enabled = true;
@@ -347,7 +349,7 @@ class CoreEnforcer {
             await this.model.buildRoleLinks(this.rmMap);
         }
     }
-    *privateEnforce(asyncCompile = true, explain = false, ...rvals) {
+    *privateEnforce(asyncCompile = true, explain = false, enforceContext = new enforceContext_1.EnforceContext('r', 'p', 'e', 'm'), ...rvals) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (!this.enabled) {
             return true;
@@ -362,19 +364,19 @@ class CoreEnforcer {
             const rm = value.rm;
             functions[key] = asyncCompile ? util_1.generateGFunction(rm) : util_1.generateSyncedGFunction(rm);
         });
-        const expString = (_b = (_a = this.model.model.get('m')) === null || _a === void 0 ? void 0 : _a.get('m')) === null || _b === void 0 ? void 0 : _b.value;
+        const expString = (_b = (_a = this.model.model.get('m')) === null || _a === void 0 ? void 0 : _a.get(enforceContext.mType)) === null || _b === void 0 ? void 0 : _b.value;
         if (!expString) {
             throw new Error('Unable to find matchers in model');
         }
-        const effectExpr = (_d = (_c = this.model.model.get('e')) === null || _c === void 0 ? void 0 : _c.get('e')) === null || _d === void 0 ? void 0 : _d.value;
+        const effectExpr = (_d = (_c = this.model.model.get('e')) === null || _c === void 0 ? void 0 : _c.get(enforceContext.eType)) === null || _d === void 0 ? void 0 : _d.value;
         if (!effectExpr) {
             throw new Error('Unable to find policy_effect in model');
         }
         const HasEval = util_1.hasEval(expString);
         let expression = undefined;
-        const p = (_e = this.model.model.get('p')) === null || _e === void 0 ? void 0 : _e.get('p');
+        const p = (_e = this.model.model.get('p')) === null || _e === void 0 ? void 0 : _e.get(enforceContext.pType);
         const policyLen = (_f = p === null || p === void 0 ? void 0 : p.policy) === null || _f === void 0 ? void 0 : _f.length;
-        const rTokens = (_h = (_g = this.model.model.get('r')) === null || _g === void 0 ? void 0 : _g.get('r')) === null || _h === void 0 ? void 0 : _h.tokens;
+        const rTokens = (_h = (_g = this.model.model.get('r')) === null || _g === void 0 ? void 0 : _g.get(enforceContext.rType)) === null || _h === void 0 ? void 0 : _h.tokens;
         const rTokensLen = rTokens === null || rTokens === void 0 ? void 0 : rTokens.length;
         const effectStream = this.eft.newStream(effectExpr);
         if (policyLen && policyLen !== 0) {
@@ -509,7 +511,11 @@ class CoreEnforcer {
      * @return whether to allow the request.
      */
     enforceSync(...rvals) {
-        return util_1.generatorRunSync(this.privateEnforce(false, false, ...rvals));
+        if (rvals[0] instanceof enforceContext_1.EnforceContext) {
+            const enforceContext = rvals.shift();
+            return util_1.generatorRunSync(this.privateEnforce(false, false, enforceContext, ...rvals));
+        }
+        return util_1.generatorRunSync(this.privateEnforce(false, false, this.defaultEnforceContext, ...rvals));
     }
     /**
      * If the matchers does not contain an asynchronous method, call it faster.
@@ -522,7 +528,11 @@ class CoreEnforcer {
      * @return whether to allow the request and the reason rule.
      */
     enforceExSync(...rvals) {
-        return util_1.generatorRunSync(this.privateEnforce(false, true, ...rvals));
+        if (rvals[0] instanceof enforceContext_1.EnforceContext) {
+            const enforceContext = rvals.shift();
+            return util_1.generatorRunSync(this.privateEnforce(false, true, enforceContext, ...rvals));
+        }
+        return util_1.generatorRunSync(this.privateEnforce(false, true, this.defaultEnforceContext, ...rvals));
     }
     /**
      * Same as enforceSync. To be removed.
@@ -539,7 +549,11 @@ class CoreEnforcer {
      * @return whether to allow the request.
      */
     async enforce(...rvals) {
-        return util_1.generatorRunAsync(this.privateEnforce(true, false, ...rvals));
+        if (rvals[0] instanceof enforceContext_1.EnforceContext) {
+            const enforceContext = rvals.shift();
+            return util_1.generatorRunAsync(this.privateEnforce(true, false, enforceContext, ...rvals));
+        }
+        return util_1.generatorRunAsync(this.privateEnforce(true, false, this.defaultEnforceContext, ...rvals));
     }
     /**
      * enforce decides whether a "subject" can access a "object" with
@@ -550,7 +564,11 @@ class CoreEnforcer {
      * @return whether to allow the request and the reason rule.
      */
     async enforceEx(...rvals) {
-        return util_1.generatorRunAsync(this.privateEnforce(true, true, ...rvals));
+        if (rvals[0] instanceof enforceContext_1.EnforceContext) {
+            const enforceContext = rvals.shift();
+            return util_1.generatorRunAsync(this.privateEnforce(true, true, enforceContext, ...rvals));
+        }
+        return util_1.generatorRunAsync(this.privateEnforce(true, true, this.defaultEnforceContext, ...rvals));
     }
     /**
      * batchEnforce enforces each request and returns result in a bool array.

package/lib/cjs/enforceContext.d.ts

@@ -0,0 +1,8 @@
+export declare class EnforceContext {
+    pType: string;
+    rType: string;
+    eType: string;
+    mType: string;
+    constructor(rType: string, pType: string, eType: string, mType: string);
+}
+export declare const newEnforceContext: (index: string) => EnforceContext;

package/lib/cjs/enforceContext.js

@@ -0,0 +1,28 @@
+"use strict";
+// Copyright 2023 The Casbin Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newEnforceContext = exports.EnforceContext = void 0;
+class EnforceContext {
+    constructor(rType, pType, eType, mType) {
+        this.pType = pType;
+        this.eType = eType;
+        this.mType = mType;
+        this.rType = rType;
+    }
+}
+exports.EnforceContext = EnforceContext;
+exports.newEnforceContext = (index) => {
+    return new EnforceContext('r' + index, 'p' + index, 'e' + index, 'm' + index);
+};

package/lib/cjs/index.d.ts

@@ -8,5 +8,6 @@ export * from './model';
 export * from './persist';
 export * from './rbac';
 export * from './log';
+export * from './enforceContext';
 export * from './frontend';
 export { Util };

package/lib/cjs/index.js

@@ -47,4 +47,5 @@ __exportStar(require("./model"), exports);
 __exportStar(require("./persist"), exports);
 __exportStar(require("./rbac"), exports);
 __exportStar(require("./log"), exports);
+__exportStar(require("./enforceContext"), exports);
 __exportStar(require("./frontend"), exports);

package/lib/cjs/util/util.js

@@ -18,8 +18,12 @@ exports.bracketCompatible = exports.customIn = exports.deepCopy = exports.genera
 // because the expression evaluation doesn't support such variable names.
 const persist_1 = require("../persist");
 function escapeAssertion(s) {
-    s = s.replace(/(?<!\w)r\./g, 'r_');
-    s = s.replace(/(?<!\w)p\./g, 'p_');
+    s = s.replace(/(?<!\w)r[0-9]*\./g, (match) => {
+        return match.replace('.', '_');
+    });
+    s = s.replace(/(?<!\w)p[0-9]*\./g, (match) => {
+        return match.replace('.', '_');
+    });
     return s;
 }
 exports.escapeAssertion = escapeAssertion;

package/lib/esm/coreEnforcer.d.ts

@@ -13,6 +13,7 @@ export declare class CoreEnforcer {
     protected fm: FunctionMap;
     protected eft: Effector;
     private matcherMap;
+    private defaultEnforceContext;
     protected adapter: UpdatableAdapter | FilteredAdapter | Adapter | BatchAdapter;
     protected watcher: Watcher | null;
     protected watcherEx: WatcherEx | null;

package/lib/esm/coreEnforcer.js

@@ -15,6 +15,7 @@ import { compile, compileAsync, addBinaryOp } from 'expression-eval';
 import { DefaultEffector, Effect } from './effect';
 import { FunctionMap, newModelFromFile } from './model';
 import { DefaultRoleManager } from './rbac';
+import { EnforceContext } from './enforceContext';
 import { escapeAssertion, generateGFunction, generateSyncedGFunction, getEvalValue, hasEval, replaceEval, generatorRunSync, generatorRunAsync, customIn, bracketCompatible, } from './util';
 import { getLogger, logPrint } from './log';
 /**
@@ -25,6 +26,7 @@ export class CoreEnforcer {
         this.fm = FunctionMap.loadFunctionMap();
         this.eft = new DefaultEffector();
         this.matcherMap = new Map();
+        this.defaultEnforceContext = new EnforceContext('r', 'p', 'e', 'm');
         this.watcher = null;
         this.watcherEx = null;
         this.enabled = true;
@@ -344,7 +346,7 @@ export class CoreEnforcer {
             await this.model.buildRoleLinks(this.rmMap);
         }
     }
-    *privateEnforce(asyncCompile = true, explain = false, ...rvals) {
+    *privateEnforce(asyncCompile = true, explain = false, enforceContext = new EnforceContext('r', 'p', 'e', 'm'), ...rvals) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (!this.enabled) {
             return true;
@@ -359,19 +361,19 @@ export class CoreEnforcer {
             const rm = value.rm;
             functions[key] = asyncCompile ? generateGFunction(rm) : generateSyncedGFunction(rm);
         });
-        const expString = (_b = (_a = this.model.model.get('m')) === null || _a === void 0 ? void 0 : _a.get('m')) === null || _b === void 0 ? void 0 : _b.value;
+        const expString = (_b = (_a = this.model.model.get('m')) === null || _a === void 0 ? void 0 : _a.get(enforceContext.mType)) === null || _b === void 0 ? void 0 : _b.value;
         if (!expString) {
             throw new Error('Unable to find matchers in model');
         }
-        const effectExpr = (_d = (_c = this.model.model.get('e')) === null || _c === void 0 ? void 0 : _c.get('e')) === null || _d === void 0 ? void 0 : _d.value;
+        const effectExpr = (_d = (_c = this.model.model.get('e')) === null || _c === void 0 ? void 0 : _c.get(enforceContext.eType)) === null || _d === void 0 ? void 0 : _d.value;
         if (!effectExpr) {
             throw new Error('Unable to find policy_effect in model');
         }
         const HasEval = hasEval(expString);
         let expression = undefined;
-        const p = (_e = this.model.model.get('p')) === null || _e === void 0 ? void 0 : _e.get('p');
+        const p = (_e = this.model.model.get('p')) === null || _e === void 0 ? void 0 : _e.get(enforceContext.pType);
         const policyLen = (_f = p === null || p === void 0 ? void 0 : p.policy) === null || _f === void 0 ? void 0 : _f.length;
-        const rTokens = (_h = (_g = this.model.model.get('r')) === null || _g === void 0 ? void 0 : _g.get('r')) === null || _h === void 0 ? void 0 : _h.tokens;
+        const rTokens = (_h = (_g = this.model.model.get('r')) === null || _g === void 0 ? void 0 : _g.get(enforceContext.rType)) === null || _h === void 0 ? void 0 : _h.tokens;
         const rTokensLen = rTokens === null || rTokens === void 0 ? void 0 : rTokens.length;
         const effectStream = this.eft.newStream(effectExpr);
         if (policyLen && policyLen !== 0) {
@@ -506,7 +508,11 @@ export class CoreEnforcer {
      * @return whether to allow the request.
      */
     enforceSync(...rvals) {
-        return generatorRunSync(this.privateEnforce(false, false, ...rvals));
+        if (rvals[0] instanceof EnforceContext) {
+            const enforceContext = rvals.shift();
+            return generatorRunSync(this.privateEnforce(false, false, enforceContext, ...rvals));
+        }
+        return generatorRunSync(this.privateEnforce(false, false, this.defaultEnforceContext, ...rvals));
     }
     /**
      * If the matchers does not contain an asynchronous method, call it faster.
@@ -519,7 +525,11 @@ export class CoreEnforcer {
      * @return whether to allow the request and the reason rule.
      */
     enforceExSync(...rvals) {
-        return generatorRunSync(this.privateEnforce(false, true, ...rvals));
+        if (rvals[0] instanceof EnforceContext) {
+            const enforceContext = rvals.shift();
+            return generatorRunSync(this.privateEnforce(false, true, enforceContext, ...rvals));
+        }
+        return generatorRunSync(this.privateEnforce(false, true, this.defaultEnforceContext, ...rvals));
     }
     /**
      * Same as enforceSync. To be removed.
@@ -536,7 +546,11 @@ export class CoreEnforcer {
      * @return whether to allow the request.
      */
     async enforce(...rvals) {
-        return generatorRunAsync(this.privateEnforce(true, false, ...rvals));
+        if (rvals[0] instanceof EnforceContext) {
+            const enforceContext = rvals.shift();
+            return generatorRunAsync(this.privateEnforce(true, false, enforceContext, ...rvals));
+        }
+        return generatorRunAsync(this.privateEnforce(true, false, this.defaultEnforceContext, ...rvals));
     }
     /**
      * enforce decides whether a "subject" can access a "object" with
@@ -547,7 +561,11 @@ export class CoreEnforcer {
      * @return whether to allow the request and the reason rule.
      */
     async enforceEx(...rvals) {
-        return generatorRunAsync(this.privateEnforce(true, true, ...rvals));
+        if (rvals[0] instanceof EnforceContext) {
+            const enforceContext = rvals.shift();
+            return generatorRunAsync(this.privateEnforce(true, true, enforceContext, ...rvals));
+        }
+        return generatorRunAsync(this.privateEnforce(true, true, this.defaultEnforceContext, ...rvals));
     }
     /**
      * batchEnforce enforces each request and returns result in a bool array.

package/lib/esm/enforceContext.d.ts

@@ -0,0 +1,8 @@
+export declare class EnforceContext {
+    pType: string;
+    rType: string;
+    eType: string;
+    mType: string;
+    constructor(rType: string, pType: string, eType: string, mType: string);
+}
+export declare const newEnforceContext: (index: string) => EnforceContext;

package/lib/esm/enforceContext.js

@@ -0,0 +1,24 @@
+// Copyright 2023 The Casbin Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+export class EnforceContext {
+    constructor(rType, pType, eType, mType) {
+        this.pType = pType;
+        this.eType = eType;
+        this.mType = mType;
+        this.rType = rType;
+    }
+}
+export const newEnforceContext = (index) => {
+    return new EnforceContext('r' + index, 'p' + index, 'e' + index, 'm' + index);
+};

package/lib/esm/index.d.ts

@@ -8,5 +8,6 @@ export * from './model';
 export * from './persist';
 export * from './rbac';
 export * from './log';
+export * from './enforceContext';
 export * from './frontend';
 export { Util };

package/lib/esm/index.js

@@ -21,5 +21,6 @@ export * from './model';
 export * from './persist';
 export * from './rbac';
 export * from './log';
+export * from './enforceContext';
 export * from './frontend';
 export { Util };

package/lib/esm/util/util.js

@@ -15,8 +15,12 @@
 // because the expression evaluation doesn't support such variable names.
 import { mustGetDefaultFileSystem } from '../persist';
 function escapeAssertion(s) {
-    s = s.replace(/(?<!\w)r\./g, 'r_');
-    s = s.replace(/(?<!\w)p\./g, 'p_');
+    s = s.replace(/(?<!\w)r[0-9]*\./g, (match) => {
+        return match.replace('.', '_');
+    });
+    s = s.replace(/(?<!\w)p[0-9]*\./g, (match) => {
+        return match.replace('.', '_');
+    });
     return s;
 }
 // removeComments removes the comments starting with # in the text.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.25.0",
+  "version": "5.26.0",
   "description": "An authorization library that supports access control models like ACL, RBAC, ABAC in Node.JS",
   "main": "lib/cjs/index.js",
   "typings": "lib/cjs/index.d.ts",