casbin 5.26.0 → 5.26.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.26.2](https://github.com/casbin/node-casbin/compare/v5.26.1...v5.26.2) (2023-07-29)
+
+
+### Bug Fixes
+
+* add escapeCsv() for CSV file saving ([17c542a](https://github.com/casbin/node-casbin/commit/17c542ad894cc19b592e3c54495fb05eff02f215))
+
+## [5.26.1](https://github.com/casbin/node-casbin/compare/v5.26.0...v5.26.1) (2023-03-29)
+
+
+### Bug Fixes
+
+* escapeAssertion is compatible with safari ([#444](https://github.com/casbin/node-casbin/issues/444)) ([d13a3b9](https://github.com/casbin/node-casbin/commit/d13a3b9030da1603f746dd20bc93354df81b182a))
+
 # [5.26.0](https://github.com/casbin/node-casbin/compare/v5.25.0...v5.26.0) (2023-03-26)
 
 

package/README.md

@@ -7,7 +7,7 @@
 [![GitHub Actions](https://github.com/casbin/node-casbin/workflows/main/badge.svg)](https://github.com/casbin/node-casbin/actions)
 [![Coverage Status](https://coveralls.io/repos/github/casbin/node-casbin/badge.svg?branch=master)](https://coveralls.io/github/casbin/node-casbin?branch=master)
 [![Release](https://img.shields.io/github/release/casbin/node-casbin.svg)](https://github.com/casbin/node-casbin/releases/latest)
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/casbin/lobby)
+[![Discord](https://img.shields.io/discord/1022748306096537660?logo=discord&label=discord&color=5865F2)](https://discord.gg/S5UjpzGZjN)
 
 [npm-image]: https://img.shields.io/npm/v/casbin.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/casbin

package/lib/cjs/persist/fileAdapter.d.ts

@@ -21,6 +21,7 @@ export declare class FileAdapter implements Adapter {
      * savePolicy saves all policy rules to the storage.
      */
     savePolicy(model: Model): Promise<boolean>;
+    private escapeCsv;
     private savePolicyFile;
     /**
      * addPolicy adds a policy rule to the storage.

package/lib/cjs/persist/fileAdapter.js

@@ -63,13 +63,20 @@ class FileAdapter {
         gList.forEach((n) => {
             n.policy.forEach((m) => {
                 result += n.key + ', ';
-                result += util_1.arrayToString(m);
+                result += util_1.arrayToString(m.map((element) => this.escapeCsv(element)));
                 result += '\n';
             });
         });
         await this.savePolicyFile(result.trim());
         return true;
     }
+    escapeCsv(value) {
+        // If the value contains a comma, wrap it in double quotes and escape any existing double quotes
+        if (value.includes(',')) {
+            return `"${value.replace(/"/g, '""')}"`;
+        }
+        return value;
+    }
     async savePolicyFile(text) {
         (this.fs ? this.fs : fileSystem_1.mustGetDefaultFileSystem()).writeFileSync(this.filePath, text);
     }

package/lib/cjs/util/util.js

@@ -17,12 +17,10 @@ exports.bracketCompatible = exports.customIn = exports.deepCopy = exports.genera
 // escapeAssertion escapes the dots in the assertion,
 // because the expression evaluation doesn't support such variable names.
 const persist_1 = require("../persist");
+const escapeAssertionReg = new RegExp(/(^|[^A-Za-z0-9_])([rp])[0-9]*\./g);
 function escapeAssertion(s) {
-    s = s.replace(/(?<!\w)r[0-9]*\./g, (match) => {
-        return match.replace('.', '_');
-    });
-    s = s.replace(/(?<!\w)p[0-9]*\./g, (match) => {
-        return match.replace('.', '_');
+    s = s.replace(escapeAssertionReg, (match, p1, p2) => {
+        return p1 + p2 + match.substring(p1.length + p2.length).replace('.', '_');
     });
     return s;
 }

package/lib/esm/persist/fileAdapter.d.ts

@@ -21,6 +21,7 @@ export declare class FileAdapter implements Adapter {
      * savePolicy saves all policy rules to the storage.
      */
     savePolicy(model: Model): Promise<boolean>;
+    private escapeCsv;
     private savePolicyFile;
     /**
      * addPolicy adds a policy rule to the storage.

package/lib/esm/persist/fileAdapter.js

@@ -60,13 +60,20 @@ export class FileAdapter {
         gList.forEach((n) => {
             n.policy.forEach((m) => {
                 result += n.key + ', ';
-                result += arrayToString(m);
+                result += arrayToString(m.map((element) => this.escapeCsv(element)));
                 result += '\n';
             });
         });
         await this.savePolicyFile(result.trim());
         return true;
     }
+    escapeCsv(value) {
+        // If the value contains a comma, wrap it in double quotes and escape any existing double quotes
+        if (value.includes(',')) {
+            return `"${value.replace(/"/g, '""')}"`;
+        }
+        return value;
+    }
     async savePolicyFile(text) {
         (this.fs ? this.fs : mustGetDefaultFileSystem()).writeFileSync(this.filePath, text);
     }

package/lib/esm/util/util.js

@@ -14,12 +14,10 @@
 // escapeAssertion escapes the dots in the assertion,
 // because the expression evaluation doesn't support such variable names.
 import { mustGetDefaultFileSystem } from '../persist';
+const escapeAssertionReg = new RegExp(/(^|[^A-Za-z0-9_])([rp])[0-9]*\./g);
 function escapeAssertion(s) {
-    s = s.replace(/(?<!\w)r[0-9]*\./g, (match) => {
-        return match.replace('.', '_');
-    });
-    s = s.replace(/(?<!\w)p[0-9]*\./g, (match) => {
-        return match.replace('.', '_');
+    s = s.replace(escapeAssertionReg, (match, p1, p2) => {
+        return p1 + p2 + match.substring(p1.length + p2.length).replace('.', '_');
     });
     return s;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.26.0",
+  "version": "5.26.2",
   "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",