OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2025-03-21 20:48:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

respect rate limit factor in FileServerService

Browse source
This commit is contained in:
Hazelnoot 2024-12-07 12:18:42 -05:00
parent 32635ecc25
commit 29c3beaa62
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/backend/src/server/FileServerService.ts
View file

@ -32,6 +32,7 @@ import { RateLimiterService } from '@/server/api/RateLimiterService.js';
import { getIpHash } from '@/misc/get-ip-hash.js'; import { getIpHash } from '@/misc/get-ip-hash.js';
import { AuthenticateService } from '@/server/api/AuthenticateService.js'; import { AuthenticateService } from '@/server/api/AuthenticateService.js';
import type { IEndpointMeta } from '@/server/api/endpoints.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js';
import { RoleService } from '@/core/RoleService.js';
import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify'; import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
import type Limiter from 'ratelimiter'; import type Limiter from 'ratelimiter';
@ -59,6 +60,7 @@ export class FileServerService {
private loggerService: LoggerService, private loggerService: LoggerService,
private authenticateService: AuthenticateService, private authenticateService: AuthenticateService,
private rateLimiterService: RateLimiterService, private rateLimiterService: RateLimiterService,
private roleService: RoleService,
) { ) {
this.logger = this.loggerService.getLogger('server', 'gray'); this.logger = this.loggerService.getLogger('server', 'gray');
@ -625,12 +627,13 @@ export class FileServerService {
// koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app. // koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app.
const [user] = await this.authenticateService.authenticate(token); const [user] = await this.authenticateService.authenticate(token);
const actor = user?.id ?? getIpHash(request.ip); const actor = user?.id ?? getIpHash(request.ip);
const factor = user ? (await this.roleService.getUserPolicies(user.id)).rateLimitFactor : 1;
// Call both limits: the per-resource limit and the shared cross-resource limit // Call both limits: the per-resource limit and the shared cross-resource limit
return await this.checkResourceLimit(reply, actor, group, resource) && await this.checkSharedLimit(reply, actor, group); return await this.checkResourceLimit(reply, actor, group, resource, factor) && await this.checkSharedLimit(reply, actor, group, factor);
} }
private async checkResourceLimit(reply: FastifyReply, actor: string, group: string, resource: string): Promise<boolean> { private async checkResourceLimit(reply: FastifyReply, actor: string, group: string, resource: string, factor = 1): Promise<boolean> {
const limit = { const limit = {
// Group by resource // Group by resource
key: `${group}${resource}`, key: `${group}${resource}`,
@ -640,10 +643,10 @@ export class FileServerService {
duration: 1000 * 60 * 10, duration: 1000 * 60 * 10,
}; };
return await this.checkLimit(reply, actor, limit); return await this.checkLimit(reply, actor, limit, factor);
} }
private async checkSharedLimit(reply: FastifyReply, actor: string, group: string): Promise<boolean> { private async checkSharedLimit(reply: FastifyReply, actor: string, group: string, factor = 1): Promise<boolean> {
const limit = { const limit = {
key: group, key: group,
@ -652,12 +655,12 @@ export class FileServerService {
duration: 1000 * 60 * 60, duration: 1000 * 60 * 60,
}; };
return await this.checkLimit(reply, actor, limit); return await this.checkLimit(reply, actor, limit, factor);
} }
private async checkLimit(reply: FastifyReply, actor: string, limit: IEndpointMeta['limit'] & { key: NonNullable<string> }): Promise<boolean> { private async checkLimit(reply: FastifyReply, actor: string, limit: IEndpointMeta['limit'] & { key: NonNullable<string> }, factor = 1): Promise<boolean> {
try { try {
await this.rateLimiterService.limit(limit, actor); await this.rateLimiterService.limit(limit, actor, factor);
return true; return true;
} catch (err) { } catch (err) {
// errはLimiter.LimiterInfoであることが期待される // errはLimiter.LimiterInfoであることが期待される