Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-07 03:57:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't ratelimit VIPs

Browse Source
This commit is contained in:
Ajay Ramachandran
2021-02-18 20:47:26 -05:00
parent 57adcd3c65
commit e21ebd18a6
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app.ts
View File

@@ -18,7 +18,7 @@ import {shadowBanUser} from './routes/shadowBanUser';
import {getUsername} from './routes/getUsername'; import {getUsername} from './routes/getUsername';
import {setUsername} from './routes/setUsername'; import {setUsername} from './routes/setUsername';
import {viewedVideoSponsorTime} from './routes/viewedVideoSponsorTime'; import {viewedVideoSponsorTime} from './routes/viewedVideoSponsorTime';
import {voteOnSponsorTime} from './routes/voteOnSponsorTime'; import {voteOnSponsorTime, getUserID as voteGetUserID} from './routes/voteOnSponsorTime';
import {getSkipSegmentsByHash} from './routes/getSkipSegmentsByHash'; import {getSkipSegmentsByHash} from './routes/getSkipSegmentsByHash';
import {postSkipSegments} from './routes/postSkipSegments'; import {postSkipSegments} from './routes/postSkipSegments';
import {endpoint as getSkipSegments} from './routes/getSkipSegments'; import {endpoint as getSkipSegments} from './routes/getSkipSegments';
@@ -55,7 +55,7 @@ function setupRoutes(app: Express) {
const voteEndpoints: RequestHandler[] = [voteOnSponsorTime]; const voteEndpoints: RequestHandler[] = [voteOnSponsorTime];
const viewEndpoints: RequestHandler[] = [viewedVideoSponsorTime]; const viewEndpoints: RequestHandler[] = [viewedVideoSponsorTime];
if (config.rateLimit) { if (config.rateLimit) {
if (config.rateLimit.vote) voteEndpoints.unshift(rateLimitMiddleware(config.rateLimit.vote)); if (config.rateLimit.vote) voteEndpoints.unshift(rateLimitMiddleware(config.rateLimit.vote, voteGetUserID));
if (config.rateLimit.view) viewEndpoints.unshift(rateLimitMiddleware(config.rateLimit.view)); if (config.rateLimit.view) viewEndpoints.unshift(rateLimitMiddleware(config.rateLimit.view));
} }

12
src/middleware/requestRateLimit.ts
View File

@@ -2,8 +2,11 @@ import {getIP} from '../utils/getIP';
import {getHash} from '../utils/getHash'; import {getHash} from '../utils/getHash';
import rateLimit from 'express-rate-limit'; import rateLimit from 'express-rate-limit';
import {RateLimitConfig} from '../types/config.model'; import {RateLimitConfig} from '../types/config.model';
import {Request} from 'express';
import { isUserVIP } from '../utils/isUserVIP';
import { UserID } from '../types/user.model';
export function rateLimitMiddleware(limitConfig: RateLimitConfig): rateLimit.RateLimit { export function rateLimitMiddleware(limitConfig: RateLimitConfig, getUserID?: (req: Request) => UserID): rateLimit.RateLimit {
return rateLimit({ return rateLimit({
windowMs: limitConfig.windowMs, windowMs: limitConfig.windowMs,
max: limitConfig.max, max: limitConfig.max,
@@ -13,5 +16,12 @@ export function rateLimitMiddleware(limitConfig: RateLimitConfig): rateLimit.Rat
keyGenerator: (req) => { keyGenerator: (req) => {
return getHash(getIP(req), 1); return getHash(getIP(req), 1);
}, },
handler: (req, res, next) => {
if (getUserID === undefined || !isUserVIP(getHash(getUserID(req)))) {
return res.status(limitConfig.statusCode).send(limitConfig.message);
} else {
return next();
}
}
}); });
} }

21
src/routes/voteOnSponsorTime.ts
View File

@@ -10,6 +10,7 @@ import {getFormattedTime} from '../utils/getFormattedTime';
import {getIP} from '../utils/getIP'; import {getIP} from '../utils/getIP';
import {getHash} from '../utils/getHash'; import {getHash} from '../utils/getHash';
import {config} from '../config'; import {config} from '../config';
import { UserID } from '../types/user.model';
const voteTypes = { const voteTypes = {
normal: 0, normal: 0,
@@ -214,21 +215,25 @@ function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnSubmiss
res.sendStatus(200); res.sendStatus(200);
} }
async function voteOnSponsorTime(req: Request, res: Response) { export function getUserID(req: Request): UserID {
return req.query.userID as UserID;
}
export async function voteOnSponsorTime(req: Request, res: Response) {
const UUID = req.query.UUID as string; const UUID = req.query.UUID as string;
let userID = req.query.userID as string; const paramUserID = getUserID(req);
let type = req.query.type !== undefined ? parseInt(req.query.type as string) : undefined; let type = req.query.type !== undefined ? parseInt(req.query.type as string) : undefined;
const category = req.query.category as string; const category = req.query.category as string;
if (UUID === undefined || userID === undefined || (type === undefined && category === undefined)) { if (UUID === undefined || paramUserID === undefined || (type === undefined && category === undefined)) {
//invalid request //invalid request
res.sendStatus(400); res.sendStatus(400);
return; return;
} }
//hash the userID //hash the userID
const nonAnonUserID = getHash(userID); const nonAnonUserID = getHash(paramUserID);
userID = getHash(userID + UUID); const userID = getHash(paramUserID + UUID);
//x-forwarded-for if this server is behind a proxy //x-forwarded-for if this server is behind a proxy
const ip = getIP(req); const ip = getIP(req);
@@ -421,8 +426,4 @@ async function voteOnSponsorTime(req: Request, res: Response) {
res.status(500).json({error: 'Internal error creating segment vote'}); res.status(500).json({error: 'Internal error creating segment vote'});
} }
} }
export {
voteOnSponsorTime,
};