dbgate-tools 4.7.4-alpha.7 → 4.7.4-alpha.8

package/lib/testPermission.d.ts

@@ -1,2 +1,7 @@
-export declare function compilePermissions(permissions: string[] | string): RegExp[];
-export declare function testPermission(tested: string, permissions: RegExp[]): boolean;
+interface CompiledPermissions {
+    revoke: RegExp;
+    allow: RegExp;
+}
+export declare function compilePermissions(permissions: string[] | string): CompiledPermissions;
+export declare function testPermission(tested: string, permissions: CompiledPermissions): boolean;
+export {};

package/lib/testPermission.js

@@ -6,21 +6,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.testPermission = exports.compilePermissions = void 0;
 const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
 const isString_1 = __importDefault(require("lodash/isString"));
+const compact_1 = __importDefault(require("lodash/compact"));
+function compileRegexp(permissions) {
+    if (permissions.length == 0)
+        return null;
+    return new RegExp(permissions.map(x => '^' + (0, escapeRegExp_1.default)(x).replace(/\\\*/g, '.*') + '$').join('|'));
+}
 function compilePermissions(permissions) {
     if (!permissions)
         return null;
     if ((0, isString_1.default)(permissions))
         permissions = permissions.split(',');
-    return permissions.map(x => new RegExp('^' + (0, escapeRegExp_1.default)(x).replace(/\\\*/g, '.*') + '$'));
+    permissions = (0, compact_1.default)(permissions.map(x => x.trim()));
+    const revoke = permissions.filter(x => x.startsWith('~')).map(x => x.substring(1));
+    const allow = permissions.filter(x => !x.startsWith('~'));
+    return {
+        revoke: compileRegexp(revoke),
+        allow: compileRegexp(allow),
+    };
 }
 exports.compilePermissions = compilePermissions;
 function testPermission(tested, permissions) {
     if (!permissions)
         return true;
-    for (const permission of permissions) {
-        if (tested.match(permission))
-            return true;
+    if (!permissions.revoke)
+        return true;
+    if (tested.match(permissions.revoke)) {
+        if (!tested.match(permissions.allow)) {
+            return false;
+        }
     }
-    return false;
+    return true;
 }
 exports.testPermission = testPermission;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.7.4-alpha.7",
+  "version": "4.7.4-alpha.8",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,15 +25,15 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^4.7.4-alpha.7",
+    "dbgate-types": "^4.7.4-alpha.8",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "dbgate-query-splitter": "^4.7.4-alpha.7",
-    "dbgate-sqltree": "^4.7.4-alpha.7",
+    "dbgate-query-splitter": "^4.7.4-alpha.8",
+    "dbgate-sqltree": "^4.7.4-alpha.8",
     "uuid": "^3.4.0"
   }
 }