mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-22 07:36: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>
77 lines
2.4 KiB
JavaScript
77 lines
2.4 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 TTS_IP_MAX = parseInt(process.env.TTS_IP_MAX) || 100;
|
|
const TTS_IP_WINDOW = parseInt(process.env.TTS_IP_WINDOW) || 1;
|
|
const TTS_USER_MAX = parseInt(process.env.TTS_USER_MAX) || 50;
|
|
const TTS_USER_WINDOW = parseInt(process.env.TTS_USER_WINDOW) || 1;
|
|
const TTS_VIOLATION_SCORE = process.env.TTS_VIOLATION_SCORE;
|
|
|
|
const ttsIpWindowMs = TTS_IP_WINDOW * 60 * 1000;
|
|
const ttsIpMax = TTS_IP_MAX;
|
|
const ttsIpWindowInMinutes = ttsIpWindowMs / 60000;
|
|
|
|
const ttsUserWindowMs = TTS_USER_WINDOW * 60 * 1000;
|
|
const ttsUserMax = TTS_USER_MAX;
|
|
const ttsUserWindowInMinutes = ttsUserWindowMs / 60000;
|
|
|
|
return {
|
|
ttsIpWindowMs,
|
|
ttsIpMax,
|
|
ttsIpWindowInMinutes,
|
|
ttsUserWindowMs,
|
|
ttsUserMax,
|
|
ttsUserWindowInMinutes,
|
|
ttsViolationScore: TTS_VIOLATION_SCORE,
|
|
};
|
|
};
|
|
|
|
const createTTSHandler = (ip = true) => {
|
|
const { ttsIpMax, ttsIpWindowInMinutes, ttsUserMax, ttsUserWindowInMinutes, ttsViolationScore } =
|
|
getEnvironmentVariables();
|
|
|
|
return async (req, res) => {
|
|
const type = ViolationTypes.TTS_LIMIT;
|
|
const errorMessage = {
|
|
type,
|
|
max: ip ? ttsIpMax : ttsUserMax,
|
|
limiter: ip ? 'ip' : 'user',
|
|
windowInMinutes: ip ? ttsIpWindowInMinutes : ttsUserWindowInMinutes,
|
|
};
|
|
|
|
await logViolation(req, res, type, errorMessage, ttsViolationScore);
|
|
res.status(429).json({ message: 'Too many TTS requests. Try again later' });
|
|
};
|
|
};
|
|
|
|
const createTTSLimiters = () => {
|
|
const { ttsIpWindowMs, ttsIpMax, ttsUserWindowMs, ttsUserMax } = getEnvironmentVariables();
|
|
|
|
const ipLimiterOptions = {
|
|
windowMs: ttsIpWindowMs,
|
|
max: ttsIpMax,
|
|
handler: createTTSHandler(),
|
|
keyGenerator: removePorts,
|
|
store: limiterCache('tts_ip_limiter'),
|
|
};
|
|
|
|
const userLimiterOptions = {
|
|
windowMs: ttsUserWindowMs,
|
|
max: ttsUserMax,
|
|
handler: createTTSHandler(false),
|
|
keyGenerator: function (req) {
|
|
return req.user?.id;
|
|
},
|
|
store: limiterCache('tts_user_limiter'),
|
|
};
|
|
|
|
const ttsIpLimiter = rateLimit(ipLimiterOptions);
|
|
const ttsUserLimiter = rateLimit(userLimiterOptions);
|
|
|
|
return { ttsIpLimiter, ttsUserLimiter };
|
|
};
|
|
|
|
module.exports = createTTSLimiters;
|