mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-22 15:46:33 +01:00
* fix: Add removePorts keyGenerator to all IP-based rate limiters Six IP-based rate limiters are missing the `keyGenerator: removePorts` option that is already used by the auth-related limiters (login, register, resetPassword, verifyEmail). Without it, reverse proxies that include ports in X-Forwarded-For headers cause ERR_ERL_INVALID_IP_ADDRESS errors from express-rate-limit. Fixes #12318 * fix: make removePorts IPv6-safe to prevent rate-limit key collisions The original regex `/:\d+[^:]*$/` treated the last colon-delimited segment of bare IPv6 addresses as a port, mangling valid IPs (e.g. `::1` → `::`, `2001:db8::1` → `2001:db8::`). Distinct IPv6 clients could collapse into the same rate-limit bucket. Use `net.isIP()` as a fast path for already-valid IPs, then match bracketed IPv6+port and IPv4+port explicitly. Bare IPv6 addresses are now returned unchanged. Also fixes pre-existing property ordering inconsistency in ttsLimiters.js userLimiterOptions (keyGenerator before store). * refactor: move removePorts to packages/api as TypeScript, fix import order - Move removePorts implementation to packages/api/src/utils/removePorts.ts with proper Express Request typing - Reduce api/server/utils/removePorts.js to a thin re-export from @librechat/api for backward compatibility - Consolidate removePorts import with limiterCache from @librechat/api in all 6 limiter files, fixing import order (package imports shortest to longest, local imports longest to shortest) - Remove narrating inline comments per code style guidelines --------- Co-authored-by: Danny Avila <danny@librechat.ai>
80 lines
2.5 KiB
JavaScript
80 lines
2.5 KiB
JavaScript
const rateLimit = require('express-rate-limit');
|
|
const { ViolationTypes } = require('librechat-data-provider');
|
|
const { limiterCache, removePorts } = require('@librechat/api');
|
|
const logViolation = require('~/cache/logViolation');
|
|
|
|
const getEnvironmentVariables = () => {
|
|
const FORK_IP_MAX = parseInt(process.env.FORK_IP_MAX) || 30;
|
|
const FORK_IP_WINDOW = parseInt(process.env.FORK_IP_WINDOW) || 1;
|
|
const FORK_USER_MAX = parseInt(process.env.FORK_USER_MAX) || 7;
|
|
const FORK_USER_WINDOW = parseInt(process.env.FORK_USER_WINDOW) || 1;
|
|
const FORK_VIOLATION_SCORE = process.env.FORK_VIOLATION_SCORE;
|
|
|
|
const forkIpWindowMs = FORK_IP_WINDOW * 60 * 1000;
|
|
const forkIpMax = FORK_IP_MAX;
|
|
const forkIpWindowInMinutes = forkIpWindowMs / 60000;
|
|
|
|
const forkUserWindowMs = FORK_USER_WINDOW * 60 * 1000;
|
|
const forkUserMax = FORK_USER_MAX;
|
|
const forkUserWindowInMinutes = forkUserWindowMs / 60000;
|
|
|
|
return {
|
|
forkIpWindowMs,
|
|
forkIpMax,
|
|
forkIpWindowInMinutes,
|
|
forkUserWindowMs,
|
|
forkUserMax,
|
|
forkUserWindowInMinutes,
|
|
forkViolationScore: FORK_VIOLATION_SCORE,
|
|
};
|
|
};
|
|
|
|
const createForkHandler = (ip = true) => {
|
|
const {
|
|
forkIpMax,
|
|
forkUserMax,
|
|
forkViolationScore,
|
|
forkIpWindowInMinutes,
|
|
forkUserWindowInMinutes,
|
|
} = getEnvironmentVariables();
|
|
|
|
return async (req, res) => {
|
|
const type = ViolationTypes.FILE_UPLOAD_LIMIT;
|
|
const errorMessage = {
|
|
type,
|
|
max: ip ? forkIpMax : forkUserMax,
|
|
limiter: ip ? 'ip' : 'user',
|
|
windowInMinutes: ip ? forkIpWindowInMinutes : forkUserWindowInMinutes,
|
|
};
|
|
|
|
await logViolation(req, res, type, errorMessage, forkViolationScore);
|
|
res.status(429).json({ message: 'Too many requests. Try again later' });
|
|
};
|
|
};
|
|
|
|
const createForkLimiters = () => {
|
|
const { forkIpWindowMs, forkIpMax, forkUserWindowMs, forkUserMax } = getEnvironmentVariables();
|
|
|
|
const ipLimiterOptions = {
|
|
windowMs: forkIpWindowMs,
|
|
max: forkIpMax,
|
|
handler: createForkHandler(),
|
|
keyGenerator: removePorts,
|
|
store: limiterCache('fork_ip_limiter'),
|
|
};
|
|
const userLimiterOptions = {
|
|
windowMs: forkUserWindowMs,
|
|
max: forkUserMax,
|
|
handler: createForkHandler(false),
|
|
keyGenerator: function (req) {
|
|
return req.user?.id;
|
|
},
|
|
store: limiterCache('fork_user_limiter'),
|
|
};
|
|
|
|
const forkIpLimiter = rateLimit(ipLimiterOptions);
|
|
const forkUserLimiter = rateLimit(userLimiterOptions);
|
|
return { forkIpLimiter, forkUserLimiter };
|
|
};
|
|
|
|
module.exports = { createForkLimiters };
|