feat: introduce batch enforce json policies

raystack · Feb 24, 2021 · 935f4b8 · 935f4b8
1 parent df24721
commit 935f4b8
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 19 deletions.
diff --git a/app/user/resource.ts b/app/user/resource.ts
@@ -20,18 +20,19 @@ export const getListWithFilters = async (policyFilters: JSObj) => {
   const { resource = {}, action = {} } = extractResourceAction(policyFilters);
 
   // 3) run each user through casbin enforcer based on the specifed params
-  const enforcedUsers = await Promise.all(
-    allUsersWithAllPolicies.map(async (user: any) => {
-      const hasAccess = await CasbinSingleton?.enforcer?.enforceJson(
-        { user: user.id },
-        resource,
-        action
-      );
-      return R.assoc('hasAccess', hasAccess, user);
-    })
+  const policiesToBatchEnforce = allUsersWithAllPolicies.map((user: any) => ({
+    subject: { user: user.id },
+    resource,
+    action
+  }));
+  const batchEnforceResults = await CasbinSingleton?.enforcer?.batchEnforceJson(
+    policiesToBatchEnforce
   );
 
-  const usersWithAccesss = enforcedUsers.filter((user: any) => user.hasAccess);
+  const usersWithAccesss = allUsersWithAllPolicies.filter(
+    (user: any, index: number) =>
+      batchEnforceResults && batchEnforceResults[index]
+  );
 
   if (R.isEmpty(resource)) return usersWithAccesss;
 

diff --git a/lib/casbin/JsonEnforcer.ts b/lib/casbin/JsonEnforcer.ts
@@ -12,8 +12,14 @@ export const convertJSONToStringInOrder = (
   return JSON.stringify(orderedJSON);
 };
 
-type OneKey<K extends string> = Record<K, unknown>;
-type JsonAttributes = Record<string, unknown>;
+export type OneKey<K extends string> = Record<K, unknown>;
+export type JsonAttributes = Record<string, unknown>;
+
+export type PolicyObj = {
+  subject: JsonAttributes;
+  resource: JsonAttributes;
+  action: JsonAttributes;
+};
 
 export class JsonEnforcer extends CachedEnforcer {
   constructor() {
@@ -35,6 +41,15 @@ export class JsonEnforcer extends CachedEnforcer {
     );
   }
 
+  public async batchEnforceJson(policies: PolicyObj[]) {
+    const enforceBatchResult = await Promise.all(
+      policies.map(async (policy: PolicyObj) =>
+        this.enforceJson(policy.subject, policy.resource, policy.action)
+      )
+    );
+    return enforceBatchResult;
+  }
+
   public async addJsonPolicy(
     subject: JsonAttributes,
     resource: JsonAttributes,

diff --git a/lib/casbin/JsonFilteredEnforcer.ts b/lib/casbin/JsonFilteredEnforcer.ts
@@ -1,10 +1,13 @@
 /* eslint-disable class-methods-use-this */
 import { createQueryBuilder, In, Like } from 'typeorm';
 import { newEnforcerWithClass } from 'casbin';
-import { convertJSONToStringInOrder, JsonEnforcer } from './JsonEnforcer';
-
-type JsonAttributes = Record<string, unknown>;
-type OneKey<K extends string> = Record<K, unknown>;
+import {
+  convertJSONToStringInOrder,
+  JsonEnforcer,
+  JsonAttributes,
+  OneKey,
+  PolicyObj
+} from './JsonEnforcer';
 
 export class JsonFilteredEnforcer extends JsonEnforcer {
   public static params: any[];
@@ -70,6 +73,15 @@ export class JsonFilteredEnforcer extends JsonEnforcer {
     return hasAccess;
   }
 
+  public async batchEnforceJson(policies: PolicyObj[]) {
+    const enforceBatchResult = await Promise.all(
+      policies.map(async (policy: PolicyObj) =>
+        this.enforceJson(policy.subject, policy.resource, policy.action)
+      )
+    );
+    return enforceBatchResult;
+  }
+
   public async addJsonPolicy(
     subject: JsonAttributes,
     resource: JsonAttributes,

diff --git a/test/app/user/resource.ts b/test/app/user/resource.ts
@@ -110,9 +110,9 @@ lab.experiment('User::resource', () => {
       const result = (await Resource.list(filter)).map(removeTimestamps);
 
       const expectedResult = [
-        { ...users[0], policies: [], hasAccess: true },
-        { ...users[1], policies: [], hasAccess: true },
-        { ...users[2], policies: [userEntityPolicy], hasAccess: true }
+        { ...users[0], policies: [] },
+        { ...users[1], policies: [] },
+        { ...users[2], policies: [userEntityPolicy] }
       ].map(removeTimestamps);
 
       // ? We need to sort before checking because [1, 2, 3] != [2, 1, 3]