-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(router): remove rate limit library and add custom implementa…
…tion (#1081)
- Loading branch information
1 parent
6b2a7e7
commit 05446c7
Showing
4 changed files
with
29 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 24 additions & 35 deletions
59
modules/router/src/security/handlers/rate-limiter/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,43 @@ | ||
| import { Cluster, Redis } from 'ioredis'; | ||
| import { RateLimiterRedis, RateLimiterRes } from 'rate-limiter-flexible'; | ||
| import ConduitGrpcSdk, { ConduitError } from '@conduitplatform/grpc-sdk'; | ||
| import { ConfigController } from '@conduitplatform/module-tools'; | ||
| import { isNil } from 'lodash-es'; | ||
|
|
||
| export class RateLimiter { | ||
| constructor(private readonly grpcSdk: ConduitGrpcSdk) { | ||
| const redisClient: Redis | Cluster = this.grpcSdk.redisManager.getClient({ | ||
| enableOfflineQueue: false, | ||
| }); | ||
| const config = ConfigController.getInstance().config.rateLimit; | ||
| this._limiter = new RateLimiterRedis({ | ||
| storeClient: redisClient, | ||
| keyPrefix: 'mainLimiter', | ||
| points: config.maxRequests, | ||
| duration: config.resetInterval, | ||
| blockDuration: 10, | ||
| execEvenly: false, | ||
| }); | ||
| } | ||
| private redisClient: Redis | Cluster; | ||
|
|
||
| updateConfig() { | ||
| const config = ConfigController.getInstance().config.rateLimit; | ||
| this._limiter.points = config.maxRequests; | ||
| this._limiter.duration = config.resetInterval; | ||
| constructor(private readonly grpcSdk: ConduitGrpcSdk) { | ||
| this.redisClient = this.grpcSdk.redisManager.getClient(); | ||
| } | ||
|
|
||
| private _limiter: RateLimiterRedis; | ||
|
|
||
| get limiter() { | ||
| const self = this; | ||
| return (req: any, res: any, next: any) => { | ||
| if (req.method === 'OPTIONS') return next(); | ||
| const ip = | ||
| req.headers['cf-connecting-ip'] || | ||
| const config = ConfigController.getInstance().config.rateLimit; | ||
| const prefix = 'limiter'; | ||
| const ip = (req.headers['cf-connecting-ip'] || | ||
| req.headers['x-original-forwarded-for'] || | ||
| req.headers['x-forwarded-for'] || | ||
| req.headers['x-real-ip'] || | ||
| req.ip; | ||
| self._limiter | ||
| .consume(ip) | ||
| .then(() => { | ||
| next(); | ||
| }) | ||
| .catch((rateLimiterRes: RateLimiterRes) => { | ||
| req.ip) as string; | ||
| if (req.method === 'OPTIONS') next(); | ||
| self.redisClient.incr(`${prefix}:${ip}`, (err, requests) => { | ||
| if (err || isNil(requests) || !requests) { | ||
| ConduitGrpcSdk.Logger.error( | ||
| `RATE_LIMIT: error with redis when processing limit.`, | ||
| ); | ||
| } | ||
| if (requests === 1) { | ||
| self.redisClient.expire(`${prefix}:${ip}`, config.resetInterval); | ||
| } | ||
| if (requests! > config.maxRequests) { | ||
| ConduitGrpcSdk.Logger.info( | ||
| `RATE_LIMIT: ${ip} exceeded rate limit, ${rateLimiterRes.consumedPoints} consumed. | ||
| ${rateLimiterRes.msBeforeNext} before next request is allowed.`, | ||
| `RATE_LIMIT: ${ip} exceeded rate limit, ${requests} consumed.`, | ||
| ); | ||
| next(new ConduitError('RATE_LIMIT', 429, 'Too Many Requests')); | ||
| }); | ||
| return next(new ConduitError('RATE_LIMIT', 429, 'Too Many Requests')); | ||
| } | ||
| next(); | ||
| }); | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters