casbin 5.48.0 → 5.50.0

package/lib/esm/model/model.js

@@ -447,12 +447,12 @@ export class Model {
      */
     sortPoliciesBySubjectHierarchy() {
         var _a, _b, _c;
-        if (((_b = (_a = this.model.get('e')) === null || _a === void 0 ? void 0 : _a.get('e')) === null || _b === void 0 ? void 0 : _b.value) !== "subjectPriority(p_eft) || deny" /* SUBJECT_PRIORITY */) {
+        if (((_b = (_a = this.model.get('e')) === null || _a === void 0 ? void 0 : _a.get('e')) === null || _b === void 0 ? void 0 : _b.value) !== "subjectPriority(p_eft) || deny" /* EffectExpress.SUBJECT_PRIORITY */) {
             return;
         }
         (_c = this.model.get('p')) === null || _c === void 0 ? void 0 : _c.forEach((assertion, ptype) => {
-            const domainIndex = this.getFieldIndex(ptype, "dom" /* Domain */);
-            const subIndex = this.getFieldIndex(ptype, "sub" /* Subject */);
+            const domainIndex = this.getFieldIndex(ptype, "dom" /* FieldIndex.Domain */);
+            const subIndex = this.getFieldIndex(ptype, "sub" /* FieldIndex.Subject */);
             // eslint-disable-next-line
             const subjectHierarchyMap = this.getSubjectHierarchyMap(this.model.get('g').get('g').policy);
             assertion.policy.sort((policyA, policyB) => {
@@ -478,9 +478,9 @@ export class Model {
         let domain = defaultDomain;
         groupPolicies.forEach((policy) => {
             if (policy.length !== 2)
-                domain = policy[this.getFieldIndex('p', "dom" /* Domain */)];
-            const child = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "sub" /* Subject */)]);
-            const parent = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "obj" /* Object */)]);
+                domain = policy[this.getFieldIndex('p', "dom" /* FieldIndex.Domain */)];
+            const child = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "sub" /* FieldIndex.Subject */)]);
+            const parent = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "obj" /* FieldIndex.Object */)]);
             policyMap.set(child, parent);
             if (!subjectHierarchyMap.has(child)) {
                 subjectHierarchyMap.set(child, 0);

package/lib/esm/persist/adapter.js

@@ -11,3 +11,4 @@
 // 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 {};

package/lib/esm/persist/batchAdapter.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/persist/defaultFilteredAdapter.js

@@ -46,8 +46,7 @@ export class DefaultFilteredAdapter extends FileAdapter {
         if (this.filtered) {
             throw new Error('cannot save a filtered policy');
         }
-        await super.savePolicy(model);
-        return true;
+        return super.savePolicy(model);
     }
     static filterLine(line, filter) {
         if (!filter) {

package/lib/esm/persist/fileAdapter.js

@@ -43,27 +43,25 @@ export class FileAdapter {
         }
         let result = '';
         const pList = model.model.get('p');
-        if (!pList) {
-            return false;
-        }
-        pList.forEach((n) => {
-            n.policy.forEach((m) => {
-                result += n.key + ', ';
-                result += arrayToString(m);
-                result += '\n';
+        if (pList) {
+            pList.forEach((n) => {
+                n.policy.forEach((m) => {
+                    result += n.key + ', ';
+                    result += arrayToString(m);
+                    result += '\n';
+                });
             });
-        });
-        const gList = model.model.get('g');
-        if (!gList) {
-            return false;
         }
-        gList.forEach((n) => {
-            n.policy.forEach((m) => {
-                result += n.key + ', ';
-                result += arrayToString(m.map((element) => this.escapeCsv(element)));
-                result += '\n';
+        const gList = model.model.get('g');
+        if (gList) {
+            gList.forEach((n) => {
+                n.policy.forEach((m) => {
+                    result += n.key + ', ';
+                    result += arrayToString(m.map((element) => this.escapeCsv(element)));
+                    result += '\n';
+                });
             });
-        });
+        }
         await this.savePolicyFile(result.trim());
         return true;
     }

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

@@ -3,6 +3,6 @@ export interface FileSystem {
     readFileSync(path: string, encoding?: string): Buffer | string;
     writeFileSync(path: string, text: string, encoding?: string): void;
 }
-export declare const setDefaultFileSystem: (fs?: FileSystem | undefined) => void;
+export declare const setDefaultFileSystem: (fs?: FileSystem) => void;
 export declare const getDefaultFileSystem: () => FileSystem | undefined;
 export declare const mustGetDefaultFileSystem: () => FileSystem;

package/lib/esm/persist/filteredAdapter.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/persist/updatableAdapter.js

@@ -11,3 +11,4 @@
 // 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 {};

package/lib/esm/persist/watcher.js

@@ -11,3 +11,4 @@
 // 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 {};

package/lib/esm/persist/watcherEx.js

@@ -11,3 +11,4 @@
 // 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 {};

package/lib/esm/rbac/defaultRoleManager.d.ts

@@ -1,5 +1,5 @@
 import { RoleManager } from './roleManager';
-export declare type MatchingFunc = (arg1: string, arg2: string) => boolean;
+export type MatchingFunc = (arg1: string, arg2: string) => boolean;
 export declare class DefaultRoleManager implements RoleManager {
     private allDomains;
     private maxHierarchyLevel;

package/lib/esm/rbac/roleManager.js

@@ -11,3 +11,4 @@
 // 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 {};

package/lib/esm/util/ip.d.ts

@@ -1,10 +1,10 @@
 import { Buffer } from 'buffer/';
 export declare const ip: {
-    toBuffer: (ip: string, buff?: Buffer | undefined, offset?: number | undefined) => Buffer;
-    toString: (buff: Buffer, offset?: number | undefined, length?: number | undefined) => string;
+    toBuffer: (ip: string, buff?: Buffer, offset?: number) => Buffer;
+    toString: (buff: Buffer, offset?: number, length?: number) => string;
     isV4Format: (ip: string) => boolean;
     isV6Format: (ip: string) => boolean;
-    fromPrefixLen: (prefixlen: number, family?: string | undefined) => string;
+    fromPrefixLen: (prefixlen: number, family?: string) => string;
     mask: (addr: string, mask: string) => string;
     subnet: (addr: string, mask: string) => any;
     cidrSubnet: (cidrString: string) => any;

package/lib/esm/util/ip.js

@@ -26,7 +26,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 import { Buffer } from 'buffer/';
-const ipv4Regex = /^(\d{1,3}\.){3,3}\d{1,3}$/;
+const ipv4Regex = /^(25[0-5]|2[0-4]\d|1\d\d|\d?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|\d?\d)){3}$/;
 const ipv6Regex = /^(::)?(((\d{1,3}\.){3}(\d{1,3}){1})?([0-9a-f]){0,4}:{0,2}){1,8}(::)?$/i;
 export const ip = {
     toBuffer: function (ip, buff, offset) {
@@ -122,15 +122,13 @@ export const ip = {
         return ipv4Regex.test(ip);
     },
     isV6Format: function (ip) {
-        return ipv6Regex.test(ip);
+        return ip.includes(':') && ipv6Regex.test(ip);
     },
     fromPrefixLen: function (prefixlen, family) {
+        family = _normalizeFamily(typeof family === 'string' ? family : 'ipv4');
         if (prefixlen > 32) {
             family = 'ipv6';
         }
-        else {
-            family = _normalizeFamily(typeof family === 'string' ? family : '');
-        }
         let len = 4;
         if (family === 'ipv6') {
             len = 16;
@@ -182,7 +180,7 @@ export const ip = {
         return ip.toString(result);
     },
     subnet: function (addr, mask) {
-        const networkAddress = ip.toLong(ip.mask(addr, mask));
+        const networkBuffer = ip.toBuffer(ip.mask(addr, mask));
         // Calculate the mask's length.
         const maskBuffer = ip.toBuffer(mask);
         let maskLength = 0;
@@ -200,7 +198,20 @@ export const ip = {
         }
         return {
             contains: function (other) {
-                return networkAddress === ip.toLong(ip.mask(other, mask));
+                let otherBuffer;
+                try {
+                    otherBuffer = ip.toBuffer(ip.mask(other, mask));
+                }
+                catch (_a) {
+                    return false;
+                }
+                if (networkBuffer.length !== otherBuffer.length)
+                    return false;
+                for (let i = 0; i < networkBuffer.length; i++) {
+                    if (networkBuffer[i] !== otherBuffer[i])
+                        return false;
+                }
+                return true;
             },
         };
     },
@@ -209,7 +220,8 @@ export const ip = {
         const addr = cidrParts[0];
         if (cidrParts.length !== 2)
             throw new Error('invalid CIDR subnet: ' + addr);
-        const mask = ip.fromPrefixLen(parseInt(cidrParts[1], 10));
+        const family = ip.isV6Format(addr) ? 'ipv6' : 'ipv4';
+        const mask = ip.fromPrefixLen(parseInt(cidrParts[1], 10), family);
         return ip.subnet(addr, mask);
     },
     isEqual: function (a, b) {

package/lib/esm/util/util.d.ts

@@ -6,8 +6,8 @@ declare function arrayRemoveDuplicates(s: string[]): string[];
 declare function arrayToString(a: string[]): string;
 declare function paramsToString(...v: string[]): string;
 declare function setEquals(a: string[], b: string[]): boolean;
-declare function readFile(path: string, encoding?: string): any;
-declare function writeFile(path: string, file: string, encoding?: string): any;
+declare function readFile(path: string, encoding?: string): Promise<string>;
+declare function writeFile(path: string, file: string, encoding?: string): Promise<void>;
 declare function hasEval(s: string): boolean;
 declare function replaceEval(s: string, ruleName: string, rule: string): string;
 declare function getEvalValue(s: string): string[];

package/lib/esm/util/util.js

@@ -80,8 +80,8 @@ function readFile(path, encoding) {
     const fs = mustGetDefaultFileSystem();
     return new Promise((resolve, reject) => {
         try {
-            fs.readFileSync(path, encoding || 'utf8');
-            resolve();
+            const content = fs.readFileSync(path, encoding || 'utf8');
+            resolve(content);
         }
         catch (e) {
             reject(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.48.0",
+  "version": "5.50.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",
@@ -29,7 +29,6 @@
     "@types/picomatch": "^2.2.2",
     "@typescript-eslint/eslint-plugin": "^4.17.0",
     "@typescript-eslint/parser": "^4.17.0",
-    "coveralls": "^3.0.2",
     "cz-conventional-changelog": "^3.2.0",
     "eslint": "^7.22.0",
     "eslint-config-prettier": "^6.12.0",
@@ -44,23 +43,23 @@
     "semantic-release": "^17.4.4",
     "ts-jest": "^26.5.3",
     "tslint": "^5.11.0",
-    "typescript": "^3.7.2"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
     "@casbin/expression-eval": "^5.3.0",
     "await-lock": "^2.0.1",
     "buffer": "^6.0.3",
     "csv-parse": "^5.5.6",
-    "minimatch": "^7.4.2"
+    "minimatch": "^10.2.1"
   },
   "files": [
     "lib",
     "examples"
   ],
-  "homepage": "http://casbin.org",
+  "homepage": "https://casbin.apache.org",
   "repository": {
     "type": "git",
-    "url": "https://github.com/casbin/node-casbin.git"
+    "url": "https://github.com/apache/casbin-node-casbin.git"
   },
   "license": "Apache-2.0",
   "husky": {