Skip to content

Production-ready animations, transitions, backgrounds, and scenes for Remotion

fix(render): trust only the proxy-set client IP and cap the render queue depth

dev_wandry710692f33d6d
diff --git a/app/api/render/__tests__/route.test.ts b/app/api/render/__tests__/route.test.ts
index 06c405d4..b4e06b24 100644
--- a/app/api/render/__tests__/route.test.ts
+++ b/app/api/render/__tests__/route.test.ts
@@ -21,9 +21,17 @@ const mockCheckRate = mock();
mock.module("server-only", () => ({}));
+class MockQueueFullError extends Error {
+ constructor() {
+ super("Render queue is full");
+ this.name = "QueueFullError";
+ }
+}
+
mock.module("@/lib/server/render-queue", () => ({
enqueueRender: mockEnqueue,
getJob: mockGetJob,
+ QueueFullError: MockQueueFullError,
}));
mock.module("@/lib/server/rate-limit", () => ({
@@ -55,12 +63,17 @@ afterEach(() => {
// ---------------------------------------------------------------------------
/** Build a minimal NextRequest-compatible Request for POST /api/render. */
-function makePostRequest(body: unknown, ip = "1.2.3.4"): Request {
+function makePostRequest(
+ body: unknown,
+ ip = "1.2.3.4",
+ extraHeaders?: Record<string, string>,
+): Request {
return new Request("http://localhost/api/render", {
method: "POST",
headers: {
"content-type": "application/json",
"x-forwarded-for": ip,
+ ...extraHeaders,
},
body: typeof body === "string" ? body : JSON.stringify(body),
});
@@ -243,6 +256,28 @@ describe("POST /api/render — 202 success", () => {
expect(mockCheckRate).toHaveBeenCalledWith("203.0.113.1");
});
+ it("uses the LAST hop of a spoofed x-forwarded-for, not the client-controlled first hop", async () => {
+ mockCheckRate.mockReturnValue(true);
+ mockEnqueue.mockReturnValue("job-spoof-test");
+
+ await POST(makePostRequest(validPayload(), "1.1.1.1, 9.9.9.9") as never);
+
+ expect(mockCheckRate).toHaveBeenCalledWith("9.9.9.9");
+ });
+
+ it("prefers x-real-ip over x-forwarded-for when both are present", async () => {
+ mockCheckRate.mockReturnValue(true);
+ mockEnqueue.mockReturnValue("job-real-ip-test");
+
+ await POST(
+ makePostRequest(validPayload(), "1.1.1.1, 9.9.9.9", {
+ "x-real-ip": "2.2.2.2",
+ }) as never,
+ );
+
+ expect(mockCheckRate).toHaveBeenCalledWith("2.2.2.2");
+ });
+
it("returns only { jobId } in the 202 body — no extra fields", async () => {
mockCheckRate.mockReturnValue(true);
mockEnqueue.mockReturnValue("clean-job");
@@ -253,6 +288,25 @@ describe("POST /api/render — 202 success", () => {
});
});
+// ---------------------------------------------------------------------------
+// POST /api/render — 503 queue full
+// ---------------------------------------------------------------------------
+
+describe("POST /api/render — 503 queue full", () => {
+ it("returns 503 with code queue_full when enqueueRender throws QueueFullError", async () => {
+ mockCheckRate.mockReturnValue(true);
+ mockEnqueue.mockImplementationOnce(() => {
+ throw new MockQueueFullError();
+ });
+
+ const res = await POST(makePostRequest(validPayload()) as never);
+
+ expect(res.status).toBe(503);
+ const body = await res.json();
+ expect(body.code).toBe("queue_full");
+ });
+});
+
// ---------------------------------------------------------------------------
// GET /api/render/[jobId] — 404 unknown job
// ---------------------------------------------------------------------------
diff --git a/app/api/render/route.ts b/app/api/render/route.ts
index cd11d969..b88c08a1 100644
--- a/app/api/render/route.ts
+++ b/app/api/render/route.ts
@@ -1,7 +1,7 @@
import { type NextRequest, NextResponse } from "next/server";
import { parseRenderInput, RenderInputError } from "@/lib/server/validate-input";
-import { enqueueRender } from "@/lib/server/render-queue";
+import { enqueueRender, QueueFullError } from "@/lib/server/render-queue";
import { checkRateLimit } from "@/lib/server/rate-limit";
import { ensureCleanupSweep } from "@/lib/server/cleanup";
@@ -53,16 +53,37 @@ export async function POST(request: NextRequest) {
throw err;
}
- const jobId = enqueueRender(input);
+ let jobId: string;
+ try {
+ jobId = enqueueRender(input);
+ } catch (err) {
+ if (err instanceof QueueFullError) {
+ return NextResponse.json(
+ { error: "Render queue is full. Please retry shortly.", code: "queue_full" },
+ { status: 503 },
+ );
+ }
+ throw err;
+ }
+
return NextResponse.json({ jobId }, { status: 202 });
}
-/** First hop of x-forwarded-for (the real client behind the proxy), else fallback. */
+/**
+ * The real client IP, trusting only what Traefik (the one proxy in front of
+ * this process) sets: `x-real-ip`, or else the LAST hop of `x-forwarded-for`
+ * (Traefik appends the peer; earlier hops are client-controlled and spoofable).
+ */
function clientIp(request: NextRequest): string {
+ const realIp = request.headers.get("x-real-ip")?.trim();
+ if (realIp) return realIp;
+
const forwarded = request.headers.get("x-forwarded-for");
if (forwarded) {
- const first = forwarded.split(",")[0]?.trim();
- if (first) return first;
+ const parts = forwarded.split(",");
+ const last = parts[parts.length - 1]?.trim();
+ if (last) return last;
}
- return request.headers.get("x-real-ip")?.trim() || "unknown";
+
+ return "unknown";
}
diff --git a/lib/server/__tests__/render-queue.test.ts b/lib/server/__tests__/render-queue.test.ts
index 3478c4f7..ecdbbf89 100644
--- a/lib/server/__tests__/render-queue.test.ts
+++ b/lib/server/__tests__/render-queue.test.ts
@@ -83,7 +83,7 @@ const tick = () => new Promise<void>((r) => setTimeout(r, 0));
// Import queue + mock render fn after all vi.mock() calls are hoisted.
// ---------------------------------------------------------------------------
-const { enqueueRender, getJob } = await import("@/lib/server/render-queue");
+const { enqueueRender, getJob, QueueFullError } = await import("@/lib/server/render-queue");
// ---------------------------------------------------------------------------
// Reset mock state between tests (the module singleton is shared across the
@@ -290,6 +290,28 @@ describe("render-queue — render timeout", () => {
});
});
+// ---------------------------------------------------------------------------
+// Queue depth cap — RENDER_MAX_QUEUE
+// ---------------------------------------------------------------------------
+
+describe("render-queue — queue depth cap", () => {
+ it("throws QueueFullError when RENDER_MAX_QUEUE is reached", async () => {
+ process.env.RENDER_MAX_QUEUE = "1";
+
+ const d = deferred();
+ mockRender.mockReturnValueOnce(d.promise);
+
+ enqueueRender(makeInput());
+ await tick();
+
+ expect(() => enqueueRender(makeInput())).toThrow(QueueFullError);
+
+ d.resolve("/tmp/out.mp4");
+ await tick();
+ delete process.env.RENDER_MAX_QUEUE;
+ });
+});
+
// ---------------------------------------------------------------------------
// getJob — unknown id returns undefined
// ---------------------------------------------------------------------------
diff --git a/lib/server/render-queue.ts b/lib/server/render-queue.ts
index b85f84ef..9ff0051f 100644
--- a/lib/server/render-queue.ts
+++ b/lib/server/render-queue.ts
@@ -45,15 +45,33 @@ function renderTimeoutMs(): number {
return Number.isFinite(parsed) && parsed >= 1000 ? Math.floor(parsed) : 120_000;
}
+/** Max jobs allowed in flight or waiting before new ones are rejected. */
+function maxQueueDepth(): number {
+ const parsed = Number(process.env.RENDER_MAX_QUEUE);
+ return Number.isFinite(parsed) && parsed >= 1 ? Math.floor(parsed) : 10;
+}
+
const limit = pLimit(maxConcurrent());
const jobs = new Map<string, JobState>();
+/** Thrown by enqueueRender when the queue is already at maxQueueDepth(). */
+export class QueueFullError extends Error {
+ constructor() {
+ super("Render queue is full");
+ this.name = "QueueFullError";
+ }
+}
+
/**
* Register a render and kick it off through the concurrency limiter. Returns the
* `jobId` synchronously — the actual render runs in the background and updates
* the registry. Never await the returned render work in the request handler.
*/
export function enqueueRender(input: RenderInput): string {
+ if (limit.activeCount + limit.pendingCount >= maxQueueDepth()) {
+ throw new QueueFullError();
+ }
+
const jobId = randomUUID();
const outputPath = path.join(RENDER_WORK_DIR, `${jobId}.mp4`);