casbin 5.29.0 → 5.31.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.31.0](https://github.com/casbin/node-casbin/compare/v5.30.0...v5.31.0) (2024-09-28)
+
+
+### Features
+
+* prevent duplicated sections and invalid operators in config and model ([#484](https://github.com/casbin/node-casbin/issues/484)) ([79e0f1c](https://github.com/casbin/node-casbin/commit/79e0f1c8fa551ce456b97729d52a49c762d91169))
+
+# [5.30.0](https://github.com/casbin/node-casbin/compare/v5.29.0...v5.30.0) (2024-04-26)
+
+
+### Features
+
+* ensure eft and priority are respected in p2, r2, etc ([#475](https://github.com/casbin/node-casbin/issues/475)) ([8ef3deb](https://github.com/casbin/node-casbin/commit/8ef3debae7d8f081629b038d78e3d869c32be7f2)), closes [#474](https://github.com/casbin/node-casbin/issues/474)
+
 # [5.29.0](https://github.com/casbin/node-casbin/compare/v5.28.0...v5.29.0) (2024-04-10)
 
 

package/lib/cjs/config.js

@@ -85,6 +85,7 @@ class Config {
         const linesCount = lines.length;
         let section = '';
         let currentLine = '';
+        const seenSections = new Set();
         lines.forEach((n, index) => {
             let commentPos = n.indexOf(Config.DEFAULT_COMMENT);
             if (commentPos > -1) {
@@ -105,6 +106,10 @@ class Config {
                     currentLine = '';
                 }
                 section = line.substring(1, line.length - 1);
+                if (seenSections.has(section)) {
+                    throw new Error(`Duplicated section: ${section} at line ${lineNumber}`);
+                }
+                seenSections.add(section);
             }
             else {
                 let shouldWrite = false;

package/lib/cjs/coreEnforcer.js

@@ -172,17 +172,19 @@ class CoreEnforcer {
         }
     }
     sortPolicies() {
-        var _a, _b, _c, _d;
-        const policy = (_b = (_a = this.model.model.get('p')) === null || _a === void 0 ? void 0 : _a.get('p')) === null || _b === void 0 ? void 0 : _b.policy;
-        const tokens = (_d = (_c = this.model.model.get('p')) === null || _c === void 0 ? void 0 : _c.get('p')) === null || _d === void 0 ? void 0 : _d.tokens;
-        if (policy && tokens) {
-            const priorityIndex = tokens.indexOf('p_priority');
-            if (priorityIndex !== -1) {
-                policy.sort((a, b) => {
-                    return parseInt(a[priorityIndex], 10) - parseInt(b[priorityIndex], 10);
-                });
+        var _a;
+        (_a = this.model.model.get('p')) === null || _a === void 0 ? void 0 : _a.forEach((value, key) => {
+            const policy = value.policy;
+            const tokens = value.tokens;
+            if (policy && tokens) {
+                const priorityIndex = tokens.indexOf(`${key}_priority`);
+                if (priorityIndex !== -1) {
+                    policy.sort((a, b) => {
+                        return parseInt(a[priorityIndex], 10) - parseInt(b[priorityIndex], 10);
+                    });
+                }
             }
-        }
+        });
     }
     /**
      * loadPolicy reloads the policy from file/database.
@@ -442,7 +444,7 @@ class CoreEnforcer {
                     default:
                         throw new Error('matcher result should only be of type boolean, number, or string');
                 }
-                const eft = parameters['p_eft'];
+                const eft = parameters[`${enforceContext.pType}_eft`];
                 if (eft && eftRes === effect_1.Effect.Allow) {
                     if (eft === 'allow') {
                         eftRes = effect_1.Effect.Allow;

package/lib/cjs/model/model.js

@@ -107,6 +107,10 @@ class Model {
             stringArguments.forEach((n, index) => {
                 value = value.replace(`$<${index}>`, n);
             });
+            const invalidOperators = /(?<![&|])&(?!&)|(?<![&|])\|(?!\|)|&{3,}|\|{3,}/g;
+            if (invalidOperators.test(value)) {
+                throw new Error(`Invalid operator in matcher`);
+            }
             ast.value = value;
         }
         else {
@@ -234,7 +238,7 @@ class Model {
             }
             const policy = ast.policy;
             const tokens = ast.tokens;
-            const priorityIndex = tokens.indexOf('p_priority');
+            const priorityIndex = tokens.indexOf(`${key}_priority`);
             if (priorityIndex !== -1) {
                 const priorityRule = rule[priorityIndex];
                 const insertIndex = policy.findIndex((oneRule) => oneRule[priorityIndex] >= priorityRule);
@@ -264,7 +268,7 @@ class Model {
                 return [false, []];
             }
         }
-        const priorityFlag = ast.tokens.indexOf('p_priority') !== -1;
+        const priorityFlag = ast.tokens.indexOf(`${ptype}_priority`) !== -1;
         if (priorityFlag) {
             rules.forEach((rule) => {
                 this.addPolicy(sec, ptype, rule);
@@ -286,7 +290,7 @@ class Model {
         if (index === -1) {
             return false;
         }
-        const priorityIndex = ast.tokens.indexOf('p_priority');
+        const priorityIndex = ast.tokens.indexOf(`${ptype}_priority`);
         if (priorityIndex !== -1) {
             if (oldRule[priorityIndex] === newRule[priorityIndex]) {
                 ast.policy[index] = newRule;

package/lib/esm/config.js

@@ -82,6 +82,7 @@ export class Config {
         const linesCount = lines.length;
         let section = '';
         let currentLine = '';
+        const seenSections = new Set();
         lines.forEach((n, index) => {
             let commentPos = n.indexOf(Config.DEFAULT_COMMENT);
             if (commentPos > -1) {
@@ -102,6 +103,10 @@ export class Config {
                     currentLine = '';
                 }
                 section = line.substring(1, line.length - 1);
+                if (seenSections.has(section)) {
+                    throw new Error(`Duplicated section: ${section} at line ${lineNumber}`);
+                }
+                seenSections.add(section);
             }
             else {
                 let shouldWrite = false;

package/lib/esm/coreEnforcer.js

@@ -169,17 +169,19 @@ export class CoreEnforcer {
         }
     }
     sortPolicies() {
-        var _a, _b, _c, _d;
-        const policy = (_b = (_a = this.model.model.get('p')) === null || _a === void 0 ? void 0 : _a.get('p')) === null || _b === void 0 ? void 0 : _b.policy;
-        const tokens = (_d = (_c = this.model.model.get('p')) === null || _c === void 0 ? void 0 : _c.get('p')) === null || _d === void 0 ? void 0 : _d.tokens;
-        if (policy && tokens) {
-            const priorityIndex = tokens.indexOf('p_priority');
-            if (priorityIndex !== -1) {
-                policy.sort((a, b) => {
-                    return parseInt(a[priorityIndex], 10) - parseInt(b[priorityIndex], 10);
-                });
+        var _a;
+        (_a = this.model.model.get('p')) === null || _a === void 0 ? void 0 : _a.forEach((value, key) => {
+            const policy = value.policy;
+            const tokens = value.tokens;
+            if (policy && tokens) {
+                const priorityIndex = tokens.indexOf(`${key}_priority`);
+                if (priorityIndex !== -1) {
+                    policy.sort((a, b) => {
+                        return parseInt(a[priorityIndex], 10) - parseInt(b[priorityIndex], 10);
+                    });
+                }
             }
-        }
+        });
     }
     /**
      * loadPolicy reloads the policy from file/database.
@@ -439,7 +441,7 @@ export class CoreEnforcer {
                     default:
                         throw new Error('matcher result should only be of type boolean, number, or string');
                 }
-                const eft = parameters['p_eft'];
+                const eft = parameters[`${enforceContext.pType}_eft`];
                 if (eft && eftRes === Effect.Allow) {
                     if (eft === 'allow') {
                         eftRes = Effect.Allow;

package/lib/esm/model/model.js

@@ -85,6 +85,10 @@ export class Model {
             stringArguments.forEach((n, index) => {
                 value = value.replace(`$<${index}>`, n);
             });
+            const invalidOperators = /(?<![&|])&(?!&)|(?<![&|])\|(?!\|)|&{3,}|\|{3,}/g;
+            if (invalidOperators.test(value)) {
+                throw new Error(`Invalid operator in matcher`);
+            }
             ast.value = value;
         }
         else {
@@ -212,7 +216,7 @@ export class Model {
             }
             const policy = ast.policy;
             const tokens = ast.tokens;
-            const priorityIndex = tokens.indexOf('p_priority');
+            const priorityIndex = tokens.indexOf(`${key}_priority`);
             if (priorityIndex !== -1) {
                 const priorityRule = rule[priorityIndex];
                 const insertIndex = policy.findIndex((oneRule) => oneRule[priorityIndex] >= priorityRule);
@@ -242,7 +246,7 @@ export class Model {
                 return [false, []];
             }
         }
-        const priorityFlag = ast.tokens.indexOf('p_priority') !== -1;
+        const priorityFlag = ast.tokens.indexOf(`${ptype}_priority`) !== -1;
         if (priorityFlag) {
             rules.forEach((rule) => {
                 this.addPolicy(sec, ptype, rule);
@@ -264,7 +268,7 @@ export class Model {
         if (index === -1) {
             return false;
         }
-        const priorityIndex = ast.tokens.indexOf('p_priority');
+        const priorityIndex = ast.tokens.indexOf(`${ptype}_priority`);
         if (priorityIndex !== -1) {
             if (oldRule[priorityIndex] === newRule[priorityIndex]) {
                 ast.policy[index] = newRule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.29.0",
+  "version": "5.31.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",