fix(security): resolve rate-limiting IP spoofing and eviction bypass

This commit is contained in:
ralksta
2026-03-15 07:41:49 +01:00
parent 922302ce5c
commit e9154cedb8
4 changed files with 20 additions and 33 deletions

View File

@@ -5,20 +5,14 @@
import { NextRequest, NextResponse } from 'next/server'; import { NextRequest, NextResponse } from 'next/server';
import { authenticate, isProtected } from '@/lib/auth'; import { authenticate, isProtected } from '@/lib/auth';
import { checkRateLimit } from '@/lib/rate-limit'; import { checkRateLimit, getClientIp } from '@/lib/rate-limit';
/** Tight limit for auth attempts — 10 per minute per IP. */ /** Tight limit for auth attempts — 10 per minute per IP. */
const AUTH_RPM = 10; const AUTH_RPM = 10;
export async function POST(request: NextRequest) { export async function POST(request: NextRequest) {
// ── Rate limiting (brute-force protection) ────────── // ── Rate limiting (brute-force protection) ──────────
// Security: Prioritize x-real-ip (set by trusted reverse proxies like nginx/Traefik) const ip = getClientIp(request);
// over x-forwarded-for which can be spoofed by clients.
// Note: request.ip was removed in Next.js 15+.
const ip =
request.headers.get('x-real-ip') ??
request.headers.get('x-forwarded-for')?.split(',')[0].trim() ??
'unknown';
const { success } = checkRateLimit(`auth:${ip}`, AUTH_RPM); const { success } = checkRateLimit(`auth:${ip}`, AUTH_RPM);
if (!success) { if (!success) {

View File

@@ -9,7 +9,7 @@ import { NextRequest, NextResponse } from 'next/server';
import { immich } from '@/lib/immich'; import { immich } from '@/lib/immich';
import { decodeAssetId } from '@/lib/tokens'; import { decodeAssetId } from '@/lib/tokens';
import { getConfig } from '@/lib/config'; import { getConfig } from '@/lib/config';
import { checkRateLimit } from '@/lib/rate-limit'; import { checkRateLimit, getClientIp } from '@/lib/rate-limit';
export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) { export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
const config = getConfig(); const config = getConfig();
@@ -20,12 +20,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
} }
// ── Rate limiting ────────────────────────────────── // ── Rate limiting ──────────────────────────────────
// Security: Prioritize x-real-ip (set by trusted reverse proxies like nginx/Traefik) const ip = getClientIp(request);
// over x-forwarded-for which can be spoofed by clients.
const ip =
request.headers.get('x-real-ip') ??
request.headers.get('x-forwarded-for')?.split(',')[0].trim() ??
'unknown';
const { success, resetAt } = checkRateLimit(`exif:${ip}`, config.rateLimitRpm); const { success, resetAt } = checkRateLimit(`exif:${ip}`, config.rateLimitRpm);
if (!success) { if (!success) {

View File

@@ -11,7 +11,7 @@ import { NextRequest, NextResponse } from 'next/server';
import { immich, ImageSize } from '@/lib/immich'; import { immich, ImageSize } from '@/lib/immich';
import { decodeAssetId } from '@/lib/tokens'; import { decodeAssetId } from '@/lib/tokens';
import { getConfig } from '@/lib/config'; import { getConfig } from '@/lib/config';
import { checkRateLimit } from '@/lib/rate-limit'; import { checkRateLimit, getClientIp } from '@/lib/rate-limit';
const VALID_SIZES: ImageSize[] = ['thumbnail', 'preview', 'original']; const VALID_SIZES: ImageSize[] = ['thumbnail', 'preview', 'original'];
@@ -26,13 +26,7 @@ function widthToSize(w: number): ImageSize {
export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) { export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
// ── Rate limiting ────────────────────────────────── // ── Rate limiting ──────────────────────────────────
// Security: Prioritize x-real-ip (set by trusted reverse proxies like nginx/Traefik) const ip = getClientIp(request);
// over x-forwarded-for which can be spoofed by clients.
// Note: request.ip was removed in Next.js 15+.
const ip =
request.headers.get('x-real-ip') ??
request.headers.get('x-forwarded-for')?.split(',')[0].trim() ??
'unknown';
const { success, remaining, resetAt } = checkRateLimit(ip, getConfig().rateLimitRpm); const { success, remaining, resetAt } = checkRateLimit(ip, getConfig().rateLimitRpm);
if (!success) { if (!success) {

View File

@@ -9,6 +9,16 @@
* multiple nodes, a persistent store like Redis would be required. * multiple nodes, a persistent store like Redis would be required.
*/ */
import { NextRequest } from 'next/server';
export function getClientIp(request: NextRequest): string {
return (
request.headers.get('x-real-ip') ??
request.headers.get('x-forwarded-for')?.split(',')[0].trim() ??
'unknown'
);
}
interface RateLimitEntry { interface RateLimitEntry {
count: number; count: number;
expiresAt: number; expiresAt: number;
@@ -32,15 +42,6 @@ function cleanup() {
} }
} }
/**
* Evict oldest entry when store is at capacity (FIFO).
*/
function evictIfFull() {
if (store.size < MAX_STORE_ENTRIES) return;
const firstKey = store.keys().next().value;
if (firstKey) store.delete(firstKey);
}
/** /**
* Check if a request should be allowed. * Check if a request should be allowed.
* @param ip - Client IP address * @param ip - Client IP address
@@ -61,7 +62,10 @@ export function checkRateLimit(
// New window or expired // New window or expired
if (!entry || now > entry.expiresAt) { if (!entry || now > entry.expiresAt) {
evictIfFull(); if (store.size >= MAX_STORE_ENTRIES) {
// Store is completely full with active IPs -> block to prevent memory exhaustion & rate limit bypass
return { success: false, remaining: 0, resetAt: now + windowMs };
}
const resetAt = now + windowMs; const resetAt = now + windowMs;
store.set(key, { count: 1, expiresAt: resetAt }); store.set(key, { count: 1, expiresAt: resetAt });
return { success: true, remaining: maxRpm - 1, resetAt }; return { success: true, remaining: maxRpm - 1, resetAt };