fix: close TOCTOU race + missing checks in tier limits, add AI rate limits, patch CVEs (v0.60.0)

Security audit fixes (see SECURITY_AUDIT.md): - lib/tiers.ts: checkAndIncrementTierLimit's recipe/storage branches did a live count/sum check with no lock tying it to the later write, so two concurrent requests near the cap could both pass and both write past the limit. Added checkTierLimitInTransaction — holds a per-user Postgres advisory lock for the duration of the caller's transaction, so the check and the write are atomic together. Applied to every recipe/storage write path (recipes create/update, fork, rate, avatar, and 7 AI recipe-creation routes). - Adversarial re-verification of that fix caught a bigger gap in the same area: four AI routes (photo import, idea generation, batch-cook, translate-to-new-draft) had no recipe-limit check at all. Fixed. - Added missing per-user rate limits to 5 AI endpoints (adapt, drinks, pairings, translate, variations) that had none, unlike their siblings. - search page now checks for a session server-side, matching every other page under (app)/ — defense in depth; the underlying API was already public by design and proxy.ts already blocked unauthenticated requests. - admin/settings route now uses the shared requireAdmin instead of a local duplicate. - Documented two admin support-ticket endpoints missing from the OpenAPI spec; verified full route/OpenAPI parity otherwise. - Bumped drizzle-orm to fix a SQL-identifier-escaping CVE, and overrode two transitive deps (esbuild, postcss) with known CVEs. pnpm audit is clean. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-20 22:21:51 +02:00
parent 623e5bcd34
commit 7626f1b496
31 changed files with 561 additions and 509 deletions
@@ -3,11 +3,12 @@ import { z } from "zod";
 import { and, eq } from "@epicure/db";
 import { db, recipes, recipeIngredients, recipeSteps, recipeVariations } from "@epicure/db";
 import { requireSessionOrApiKey } from "@/lib/api-auth";
+import { applyRateLimit } from "@/lib/rate-limit";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { adaptRecipe } from "@/lib/ai/features/adapt-recipe";
 import { withUserKey } from "@/lib/ai/resolve-user-key";
 import { getUserPrivateBio } from "@/lib/ai/user-bio";
-import { checkAndIncrementTierLimit, TierLimitError } from "@/lib/tiers";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";
 import { isRecipeUnchanged } from "@/lib/recipe-diff";

 const Schema = z.object({
@@ -23,8 +24,11 @@ export async function POST(req: NextRequest, { params }: Params) {
  const { session, response } = await requireSessionOrApiKey(req);
  if (response) return response;

-  const { id } = await params;
  const userId = session!.user.id;
+  const limited = await applyRateLimit(`rl:ai:${userId}`, 10, 60);
+  if (limited) return limited;
+
+  const { id } = await params;

  const recipe = await db.query.recipes.findFirst({
    where: and(eq(recipes.id, id)),
@@ -81,20 +85,12 @@ export async function POST(req: NextRequest, { params }: Params) {
    return NextResponse.json({ id: recipe.id, adaptationNotes: adapted.adaptationNotes, unchanged: true });
  }

-  try {
-    await checkAndIncrementTierLimit(userId, session!.user.tier as "free" | "pro" | "family", "recipe");
-  } catch (err) {
-    if (err instanceof TierLimitError) {
-      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
-    }
-    throw err;
-  }
-
  const newId = crypto.randomUUID();
  const now = new Date();

  try {
    await db.transaction(async (tx) => {
+      await checkTierLimitInTransaction(tx, userId, session!.user.tier as "free" | "pro" | "family", "recipe");
      await tx.insert(recipes).values({
        id: newId,
        authorId: userId,
@@ -147,7 +143,10 @@ export async function POST(req: NextRequest, { params }: Params) {
        createdAt: now,
      });
    });
-  } catch {
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
    return NextResponse.json({ error: "Failed to save the adapted recipe. Please try again." }, { status: 500 });
  }

@@ -8,6 +8,7 @@ import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { generateBatchCook } from "@/lib/ai/features/generate-batch-cook";
 import { getUserPrivateBio } from "@/lib/ai/user-bio";
 import { parseQuantity } from "@/lib/parse-quantity";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";

 const Schema = z.object({
  dinners: z.number().int().min(0).max(6).default(4),
@@ -62,7 +63,9 @@ export async function POST(req: NextRequest) {

  const recipeId = crypto.randomUUID();

-  await db.transaction(async (tx) => {
+  try {
+    await db.transaction(async (tx) => {
+    await checkTierLimitInTransaction(tx, userId, session!.user.tier as "free" | "pro" | "family", "recipe");
    await tx.insert(recipes).values({
      id: recipeId,
      authorId: userId,
@@ -117,7 +120,13 @@ export async function POST(req: NextRequest) {
        }))
      );
    }
-  });
+    });
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
+    throw err;
+  }

  return NextResponse.json({ id: recipeId });
 }
@@ -3,6 +3,7 @@ import { z } from "zod";
 import { and, eq } from "@epicure/db";
 import { db, recipes } from "@epicure/db";
 import { requireSessionOrApiKey } from "@/lib/api-auth";
+import { applyRateLimit } from "@/lib/rate-limit";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { suggestDrinks } from "@/lib/ai/features/suggest-drinks";
 import { withUserKey } from "@/lib/ai/resolve-user-key";
@@ -21,6 +22,9 @@ export async function POST(req: NextRequest, { params }: Params) {
  const { session, response } = await requireSessionOrApiKey(req);
  if (response) return response;

+  const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 10, 60);
+  if (limited) return limited;
+
  try {
    await requireFeatureEnabled(session!.user.id, "drink_pairing");
  } catch (err) {
@@ -8,6 +8,7 @@ import { getUserPrivateBio } from "@/lib/ai/user-bio";
 import { withUserKey } from "@/lib/ai/resolve-user-key";
 import { db, recipes, recipeIngredients, recipeSteps } from "@epicure/db";
 import { parseQuantity } from "@/lib/parse-quantity";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";

 const Schema = z.object({
  title: z.string().min(1).max(200),
@@ -51,47 +52,58 @@ export async function POST(req: NextRequest) {

  const recipeId = crypto.randomUUID();

-  await db.insert(recipes).values({
-    id: recipeId,
-    authorId: session!.user.id,
-    title: recipe.title,
-    description: recipe.description ?? null,
-    baseServings: recipe.baseServings,
-    recipeType: recipe.recipeType,
-    prepMins: recipe.prepMins ?? null,
-    cookMins: recipe.cookMins ?? null,
-    difficulty: recipe.difficulty ?? null,
-    visibility: "private",
-    aiGenerated: true,
-    language: locale,
-    dietaryTags: recipe.dietaryTags ?? {},
-    tags: [],
-  });
+  try {
+    await db.transaction(async (tx) => {
+      await checkTierLimitInTransaction(tx, session!.user.id, session!.user.tier as "free" | "pro" | "family", "recipe");

-  if (recipe.ingredients?.length) {
-    await db.insert(recipeIngredients).values(
-      recipe.ingredients.map((ing, i) => ({
-        id: crypto.randomUUID(),
-        recipeId,
-        rawName: ing.rawName,
-        quantity: parseQuantity(ing.quantity) ?? null,
-        unit: ing.unit ?? null,
-        note: ing.note ?? null,
-        order: i,
-      }))
-    );
-  }
+      await tx.insert(recipes).values({
+        id: recipeId,
+        authorId: session!.user.id,
+        title: recipe.title,
+        description: recipe.description ?? null,
+        baseServings: recipe.baseServings,
+        recipeType: recipe.recipeType,
+        prepMins: recipe.prepMins ?? null,
+        cookMins: recipe.cookMins ?? null,
+        difficulty: recipe.difficulty ?? null,
+        visibility: "private",
+        aiGenerated: true,
+        language: locale,
+        dietaryTags: recipe.dietaryTags ?? {},
+        tags: [],
+      });

-  if (recipe.steps?.length) {
-    await db.insert(recipeSteps).values(
-      recipe.steps.map((step, i) => ({
-        id: crypto.randomUUID(),
-        recipeId,
-        instruction: step.instruction,
-        timerSeconds: step.timerSeconds ?? null,
-        order: i,
-      }))
-    );
+      if (recipe.ingredients?.length) {
+        await tx.insert(recipeIngredients).values(
+          recipe.ingredients.map((ing, i) => ({
+            id: crypto.randomUUID(),
+            recipeId,
+            rawName: ing.rawName,
+            quantity: parseQuantity(ing.quantity) ?? null,
+            unit: ing.unit ?? null,
+            note: ing.note ?? null,
+            order: i,
+          }))
+        );
+      }
+
+      if (recipe.steps?.length) {
+        await tx.insert(recipeSteps).values(
+          recipe.steps.map((step, i) => ({
+            id: crypto.randomUUID(),
+            recipeId,
+            instruction: step.instruction,
+            timerSeconds: step.timerSeconds ?? null,
+            order: i,
+          }))
+        );
+      }
+    });
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
+    throw err;
  }

  return NextResponse.json({ id: recipeId });
@@ -5,7 +5,7 @@ import { requireSessionOrApiKey } from "@/lib/api-auth";
 import { applyRateLimit } from "@/lib/rate-limit";
 import { getDefaultProviderWithKey } from "@/lib/ai/resolve-user-key";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
-import { checkAndIncrementTierLimit, TierLimitError } from "@/lib/tiers";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";
 import { generateMeal, MEAL_COURSES } from "@/lib/ai/features/generate-meal";
 import { getUserPrivateBio } from "@/lib/ai/user-bio";
 import { getMessages } from "@/lib/i18n/server";
@@ -59,20 +59,13 @@ export async function POST(req: NextRequest) {
  if (!result.ok) return result.response;
  const meal = result.data;

-  // Each recipe in the meal creates a real recipe row — check the recipe
-  // limit covers all of them before inserting anything.
-  try {
-    await checkAndIncrementTierLimit(userId, tier, "recipe", meal.recipes.length);
-  } catch (err) {
-    if (err instanceof TierLimitError) {
-      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
-    }
-    throw err;
-  }
-
  const created: Array<{ id: string; title: string; course: string }> = [];

-  await db.transaction(async (tx) => {
+  try {
+    await db.transaction(async (tx) => {
+    // Each recipe in the meal creates a real recipe row — check the recipe
+    // limit covers all of them before inserting anything.
+    await checkTierLimitInTransaction(tx, userId, tier, "recipe", meal.recipes.length);
    for (const recipe of meal.recipes) {
      const recipeId = crypto.randomUUID();
      await tx.insert(recipes).values({
@@ -122,7 +115,13 @@ export async function POST(req: NextRequest) {

      created.push({ id: recipeId, title: recipe.title, course: recipe.course });
    }
-  });
+    });
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
+    throw err;
+  }

  return NextResponse.json({ collectionId, recipes: created });
 }
@@ -6,6 +6,7 @@ import { applyRateLimit } from "@/lib/rate-limit";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { importFromPhoto } from "@/lib/ai/features/import-photo";
 import { getModelConfigForUseCase } from "@/lib/ai/resolve-user-key";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";

 const Schema = z.object({
  imageBase64: z.string().max(14_000_000),
@@ -56,7 +57,9 @@ export async function POST(req: NextRequest) {
  const newRecipeId = crypto.randomUUID();
  const now = new Date();

-  await db.transaction(async (tx) => {
+  try {
+    await db.transaction(async (tx) => {
+    await checkTierLimitInTransaction(tx, userId, session!.user.tier as "free" | "pro" | "family", "recipe");
    await tx.insert(recipes).values({
      id: newRecipeId,
      authorId: userId,
@@ -105,7 +108,13 @@ export async function POST(req: NextRequest) {
        }))
      );
    }
-  });
+    });
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
+    throw err;
+  }

  return NextResponse.json({ id: newRecipeId });
 }
@@ -5,7 +5,7 @@ import { requireSessionOrApiKey } from "@/lib/api-auth";
 import { applyRateLimit } from "@/lib/rate-limit";
 import { getDefaultProviderWithKey } from "@/lib/ai/resolve-user-key";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
-import { checkAndIncrementTierLimit, TierLimitError } from "@/lib/tiers";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";
 import { generateMealPlan } from "@/lib/ai/features/generate-meal-plan";
 import { getUserPrivateBio } from "@/lib/ai/user-bio";

@@ -93,17 +93,6 @@ export async function POST(req: NextRequest) {
  if (!result.ok) return result.response;
  const plan = result.data;

-  // Each plan entry creates a draft recipe — check the recipe limit covers
-  // all of them before inserting anything.
-  try {
-    await checkAndIncrementTierLimit(userId, session!.user.tier as "free" | "pro" | "family", "recipe", plan.entries.length);
-  } catch (err) {
-    if (err instanceof TierLimitError) {
-      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
-    }
-    throw err;
-  }
-
  // Ensure meal plan row exists for the week
  let mealPlan = await db.query.mealPlans.findFirst({
    where: and(eq(mealPlans.userId, userId), eq(mealPlans.weekStart, parsed.data.weekStart)),
@@ -117,7 +106,11 @@ export async function POST(req: NextRequest) {

  const createdEntries: Array<{ id: string; day: string; mealType: string; recipeId: string; recipeTitle: string }> = [];

-  await db.transaction(async (tx) => {
+  try {
+    await db.transaction(async (tx) => {
+    // Each plan entry creates a draft recipe — check the recipe limit covers
+    // all of them before inserting anything.
+    await checkTierLimitInTransaction(tx, userId, session!.user.tier as "free" | "pro" | "family", "recipe", plan.entries.length);
    for (const entry of plan.entries) {
      // Create draft recipe
      const recipeId = crypto.randomUUID();
@@ -184,7 +177,13 @@ export async function POST(req: NextRequest) {

      createdEntries.push({ id: entryId, day: entry.day, mealType: entry.mealType, recipeId, recipeTitle: entry.recipe.title });
    }
-  });
+    });
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
+    throw err;
+  }

  return NextResponse.json({ weekStart: parsed.data.weekStart, entries: createdEntries });
 }
@@ -3,6 +3,7 @@ import { z } from "zod";
 import { and, eq } from "@epicure/db";
 import { db, recipes } from "@epicure/db";
 import { requireSessionOrApiKey } from "@/lib/api-auth";
+import { applyRateLimit } from "@/lib/rate-limit";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { suggestPairings } from "@/lib/ai/features/suggest-pairings";
 import { withUserKey } from "@/lib/ai/resolve-user-key";
@@ -21,6 +22,9 @@ export async function POST(req: NextRequest, { params }: Params) {
  const { session, response } = await requireSessionOrApiKey(req);
  if (response) return response;

+  const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 10, 60);
+  if (limited) return limited;
+
  try {
    await requireFeatureEnabled(session!.user.id, "meal_pairing");
  } catch (err) {
@@ -3,9 +3,11 @@ import { z } from "zod";
 import { and, eq } from "@epicure/db";
 import { db, recipes, recipeIngredients, recipeSteps } from "@epicure/db";
 import { requireSessionOrApiKey } from "@/lib/api-auth";
+import { applyRateLimit } from "@/lib/rate-limit";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { translateRecipe } from "@/lib/ai/features/translate-recipe";
 import { withUserKey } from "@/lib/ai/resolve-user-key";
+import { checkTierLimitInTransaction, TierLimitError } from "@/lib/tiers";

 const Schema = z.object({
  targetLanguage: z.string().min(2).max(50),
@@ -19,6 +21,9 @@ export async function POST(req: NextRequest, { params }: Params) {
  const { session, response } = await requireSessionOrApiKey(req);
  if (response) return response;

+  const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 10, 60);
+  if (limited) return limited;
+
  const { id } = await params;
  const recipe = await db.query.recipes.findFirst({
    where: and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)),
@@ -61,7 +66,9 @@ export async function POST(req: NextRequest, { params }: Params) {
  const newId = crypto.randomUUID();
  const now = new Date();

-  await db.transaction(async (tx) => {
+  try {
+    await db.transaction(async (tx) => {
+    await checkTierLimitInTransaction(tx, session!.user.id, session!.user.tier as "free" | "pro" | "family", "recipe");
    await tx.insert(recipes).values({
      id: newId,
      authorId: session!.user.id,
@@ -103,7 +110,13 @@ export async function POST(req: NextRequest, { params }: Params) {
        }))
      );
    }
-  });
+    });
+  } catch (err) {
+    if (err instanceof TierLimitError) {
+      return NextResponse.json({ error: "Recipe limit reached for your tier" }, { status: 403 });
+    }
+    throw err;
+  }

  return NextResponse.json({ id: newId });
 }
@@ -3,6 +3,7 @@ import { z } from "zod";
 import { and, eq } from "@epicure/db";
 import { db, recipes } from "@epicure/db";
 import { requireSessionOrApiKey } from "@/lib/api-auth";
+import { applyRateLimit } from "@/lib/rate-limit";
 import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
 import { suggestVariations } from "@/lib/ai/features/suggest-variations";
 import { withUserKey } from "@/lib/ai/resolve-user-key";
@@ -22,6 +23,9 @@ export async function POST(req: NextRequest, { params }: Params) {
  const { session, response } = await requireSessionOrApiKey(req);
  if (response) return response;

+  const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 10, 60);
+  if (limited) return limited;
+
  try {
    await requireFeatureEnabled(session!.user.id, "recipe_variations");
  } catch (err) {