diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-11-22 23:03:34 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-11-22 23:03:34 +0000 |
| commit | caaa78d98d1d7b739fc87111afa7ed7a5e9b0f95 (patch) | |
| tree | 96bfd2747bdc3f698cd766f68d11678ce81cbae7 /packages/backend/src | |
| parent | merge: Add rate limits to all public endpoints (!767) (diff) | |
| parent | add default / fallback rate limit (diff) | |
| download | sharkey-caaa78d98d1d7b739fc87111afa7ed7a5e9b0f95.tar.gz sharkey-caaa78d98d1d7b739fc87111afa7ed7a5e9b0f95.tar.bz2 sharkey-caaa78d98d1d7b739fc87111afa7ed7a5e9b0f95.zip | |
merge: Add default rate limit (!768)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/768
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/server/api/ApiCallService.ts | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index 016db6ac19..6f51825494 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -311,7 +311,15 @@ export class ApiCallService implements OnApplicationShutdown { throw new ApiError(accessDenied); } - if (ep.meta.limit) { + // For endpoints without a limit, the default is 10 calls per second + const endpointLimit: IEndpointMeta['limit'] = ep.meta.limit ?? { + duration: 1000, + max: 10, + }; + + // We don't need this check, but removing it would cause a big merge conflict. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (endpointLimit) { // koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app. let limitActor: string; if (user) { @@ -320,7 +328,7 @@ export class ApiCallService implements OnApplicationShutdown { limitActor = getIpHash(request.ip); } - const limit = Object.assign({}, ep.meta.limit); + const limit = Object.assign({}, endpointLimit); if (limit.key == null) { (limit as any).key = ep.name; |