Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Access Control] Fix performance issues with Redis SCAN #105

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions access-control/lib/services/access-control.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ export class AccessControlService {

public async clearCacheForUser(user: Users) {
await Promise.all([
this.redisService.scanDel(RedisKeyUtils.userAccessControl(user, "*")),
this.redisService.scanDel(RedisKeyUtils.userResourceActionKey(user, "*", "*" as AccessActionType)),
this.redisService.scanDel(RedisKeyUtils.userResourceActionPattern(user, "*")),
this.redisService.scanDel(RedisKeyUtils.userResourceIdKey("*", "*" as any, user)),
this.redisService.scanDel(RedisKeyUtils.userAccessControl(user, "*"), { count: 10000 }),
this.redisService.scanDel(RedisKeyUtils.userResourceActionKey(user, "*", "*" as AccessActionType), { count: 10000 }),
this.redisService.scanDel(RedisKeyUtils.userResourceActionPattern(user, "*"), { count: 10000 }),
this.redisService.scanDel(RedisKeyUtils.userResourceIdKey("*", "*" as any, user), { count: 10000 }),
]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class ResourceAccessControlService {
);

const nestedMatchedKeys = await Promise.all(
keyPatterns.map((keyPattern) => this.redisService.scan(keyPattern))
keyPatterns.map((keyPattern) => this.redisService.scan(keyPattern, { count: 10000 }))
);
const matchedKeysWithResourceId = nestedMatchedKeys.map(
(matchedKeys, index) => [matchedKeys, parsedResourceIds[index]] as [string[], ResourceId]
Expand Down Expand Up @@ -165,7 +165,8 @@ export class ResourceAccessControlService {

private async getWildcardUsersAccess(options?: { role?: string; action?: AccessActionType }): Promise<Users[]> {
const matchedKeys = await this.redisService.scan(
RedisKeyUtils.usersResourceActionWildcardPattern(this.resourceName, options?.role)
RedisKeyUtils.usersResourceActionWildcardPattern(this.resourceName, options?.role),
{ count: 10000 }
);

if (!options?.action) {
Expand Down
2 changes: 1 addition & 1 deletion access-control/lib/services/resource-access.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export class ResourceAccessService {
}

public async deleteResourceAccesses(resourceName: string, resourceId: ResourceId): Promise<void> {
await this.redisService.scanDel(RedisKeyUtils.userResourceIdPattern(resourceName, resourceId));
await this.redisService.scanDel(RedisKeyUtils.userResourceIdPattern(resourceName, resourceId), { count: 10000 });
}

private async setUserAccessControlType(
Expand Down
36 changes: 18 additions & 18 deletions access-control/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions access-control/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@recursyve/nestjs-access-control",
"version": "9.1.0-beta.1",
"version": "9.1.0-beta.2",
"description": "NestJs AccessControl library",
"main": "index.js",
"scripts": {
Expand All @@ -22,14 +22,14 @@
"@nestjs/common": ">=9.0.0",
"@nestjs/core": ">=9.0.0",
"@nestjs/cqrs": ">=9.0.0",
"@recursyve/nestjs-redis": ">=9.3.0"
"@recursyve/nestjs-redis": ">=9.3.1"
},
"devDependencies": {
"@nestjs/common": "^9.2.1",
"@nestjs/core": "^9.2.1",
"@nestjs/cqrs": "^9.0.1",
"@nestjs/testing": "^9.2.1",
"@recursyve/nestjs-redis": "^9.3.0",
"@recursyve/nestjs-redis": "^9.3.1",
"@types/jest": "^29.2.5",
"gulp": "^4.0.2",
"gulp-copy": "^4.0.1",
Expand Down