fix: audit fixes — tier-quota bypass, webhook SSRF, auth hardening, pagination, a11y
Full audit (bugs/UI-UX/backend/feature-gap) turned up a money-leak AI quota bypass, webhook SSRF, and a long tail of missing pagination/auth/a11y work. Fixes land together since HANDOFF.md tracked them as one backlog. - AI routes charge tier quota before generating; nutrition POST is author-only - Webhook dispatch re-validates URL per delivery (SSRF/DNS-rebinding), treats redirects as failures; recipe.published now actually dispatches - New indexes/unique constraints on recipes, meal-planning, comments FK cascade - Recipe PUT/restore snapshot only inside the transaction, after validation - Recipe DELETE cleans up S3 objects (recipe + review photos) - Optimistic UI (favorite/star/follow/shopping-list) rolls back on failure - Upload presign enforces file size cap + per-tier storage quota - Route-level loading/error/not-found states across (app), admin, and root - middleware.ts guards (app)/admin; requireAdmin checks DB role, not cached session; rate limiting applied to both session and API-key branches, bucketed per key; Stripe webhook dedupes by event id - Pagination added to recipes, feed, profile, comments, pantry, admin tables - Nav shows real avatar + profile link + dark-mode toggle; destructive actions standardized on AlertDialog - Unsaved-changes guard + real ingredient/step validation on recipe form; canonical /recipes/[id] used in-app; next/image migration; aria-labels and alt text across icon buttons, avatars, recipe photos - packages/api-types removed (zero callers, too drifted to safely rewire); openapi.ts and ai-keys error shape drift fixed; BYOK decrypt failures now surface instead of silently falling back to the platform key Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { z } from "zod";
|
||||
import { db, recipes, comments, users, userBlocks, eq, and, inArray } from "@epicure/db";
|
||||
import { db, recipes, comments, users, userBlocks, eq, and, inArray, isNull, sql } from "@epicure/db";
|
||||
import { requireSession } from "@/lib/api-auth";
|
||||
import { applyRateLimit } from "@/lib/rate-limit";
|
||||
import { dispatchWebhook } from "@/lib/webhooks";
|
||||
@@ -16,7 +16,19 @@ const Schema = z.object({
|
||||
|
||||
type Params = { params: Promise<{ id: string }> };
|
||||
|
||||
export async function GET(_req: NextRequest, { params }: Params) {
|
||||
const COMMENT_COLUMNS = {
|
||||
id: comments.id,
|
||||
content: comments.content,
|
||||
parentId: comments.parentId,
|
||||
createdAt: comments.createdAt,
|
||||
updatedAt: comments.updatedAt,
|
||||
userId: comments.userId,
|
||||
userName: users.name,
|
||||
userUsername: users.username,
|
||||
userAvatarUrl: users.avatarUrl,
|
||||
} as const;
|
||||
|
||||
export async function GET(req: NextRequest, { params }: Params) {
|
||||
const { id } = await params;
|
||||
const recipe = await db.query.recipes.findFirst({ where: eq(recipes.id, id) });
|
||||
if (!recipe || recipe.visibility === "private") {
|
||||
@@ -25,32 +37,55 @@ export async function GET(_req: NextRequest, { params }: Params) {
|
||||
|
||||
const { session } = await requireSession();
|
||||
|
||||
const rows = await db
|
||||
.select({
|
||||
id: comments.id,
|
||||
content: comments.content,
|
||||
parentId: comments.parentId,
|
||||
createdAt: comments.createdAt,
|
||||
updatedAt: comments.updatedAt,
|
||||
userId: comments.userId,
|
||||
userName: users.name,
|
||||
userUsername: users.username,
|
||||
userAvatarUrl: users.avatarUrl,
|
||||
})
|
||||
.from(comments)
|
||||
.innerJoin(users, eq(comments.userId, users.id))
|
||||
.where(eq(comments.recipeId, id))
|
||||
.orderBy(comments.createdAt);
|
||||
const { searchParams } = req.nextUrl;
|
||||
const limitRaw = parseInt(searchParams.get("limit") ?? "20");
|
||||
const limit = Math.min(Number.isNaN(limitRaw) ? 20 : Math.max(1, limitRaw), 50);
|
||||
const offsetRaw = parseInt(searchParams.get("offset") ?? "0");
|
||||
const offset = Number.isNaN(offsetRaw) ? 0 : Math.max(0, offsetRaw);
|
||||
|
||||
if (!session) return NextResponse.json(rows);
|
||||
// Paginate top-level comments; replies to a loaded top-level comment are always
|
||||
// fetched alongside it so threads render complete (threads are typically small).
|
||||
const [topLevel, totalRow] = await Promise.all([
|
||||
db
|
||||
.select(COMMENT_COLUMNS)
|
||||
.from(comments)
|
||||
.innerJoin(users, eq(comments.userId, users.id))
|
||||
.where(and(eq(comments.recipeId, id), isNull(comments.parentId)))
|
||||
.orderBy(comments.createdAt)
|
||||
.limit(limit)
|
||||
.offset(offset),
|
||||
db
|
||||
.select({ total: sql<number>`count(*)::int` })
|
||||
.from(comments)
|
||||
.where(and(eq(comments.recipeId, id), isNull(comments.parentId))),
|
||||
]);
|
||||
|
||||
const blocked = await db
|
||||
.select({ blockedId: userBlocks.blockedId })
|
||||
.from(userBlocks)
|
||||
.where(eq(userBlocks.blockerId, session.user.id));
|
||||
const blockedIds = new Set(blocked.map((b) => b.blockedId));
|
||||
const total = totalRow[0]?.total ?? 0;
|
||||
const topLevelIds = topLevel.map((c) => c.id);
|
||||
|
||||
return NextResponse.json(rows.filter((r) => !blockedIds.has(r.userId)));
|
||||
const replies = topLevelIds.length > 0
|
||||
? await db
|
||||
.select(COMMENT_COLUMNS)
|
||||
.from(comments)
|
||||
.innerJoin(users, eq(comments.userId, users.id))
|
||||
.where(inArray(comments.parentId, topLevelIds))
|
||||
.orderBy(comments.createdAt)
|
||||
: [];
|
||||
|
||||
const rows = [...topLevel, ...replies];
|
||||
|
||||
const data = session
|
||||
? await (async () => {
|
||||
const blocked = await db
|
||||
.select({ blockedId: userBlocks.blockedId })
|
||||
.from(userBlocks)
|
||||
.where(eq(userBlocks.blockerId, session.user.id));
|
||||
const blockedIds = new Set(blocked.map((b) => b.blockedId));
|
||||
return rows.filter((r) => !blockedIds.has(r.userId));
|
||||
})()
|
||||
: rows;
|
||||
|
||||
return NextResponse.json({ data, total, limit, offset });
|
||||
}
|
||||
|
||||
export async function POST(req: NextRequest, { params }: Params) {
|
||||
|
||||
@@ -2,6 +2,8 @@ import { NextRequest, NextResponse } from "next/server";
|
||||
import { db, recipes, recipeIngredients } from "@epicure/db";
|
||||
import { eq, and, or, ne } from "@epicure/db";
|
||||
import { requireSession } from "@/lib/api-auth";
|
||||
import { applyRateLimit } from "@/lib/rate-limit";
|
||||
import { withAiQuota } from "@/lib/ai/ai-error";
|
||||
import { estimateNutrition } from "@/lib/ai/features/estimate-nutrition";
|
||||
|
||||
type Params = { params: Promise<{ id: string }> };
|
||||
@@ -31,14 +33,12 @@ export async function POST(_req: NextRequest, { params }: Params) {
|
||||
if (response) return response;
|
||||
const { id } = await params;
|
||||
|
||||
const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 10, 60);
|
||||
if (limited) return limited;
|
||||
|
||||
// Only the recipe author may trigger a (paid) nutrition estimate
|
||||
const recipe = await db.query.recipes.findFirst({
|
||||
where: and(
|
||||
eq(recipes.id, id),
|
||||
or(
|
||||
eq(recipes.authorId, session!.user.id),
|
||||
ne(recipes.visibility, "private")
|
||||
)
|
||||
),
|
||||
where: and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)),
|
||||
with: {
|
||||
ingredients: { orderBy: (t, { asc }) => asc(t.order) },
|
||||
},
|
||||
@@ -46,17 +46,20 @@ export async function POST(_req: NextRequest, { params }: Params) {
|
||||
|
||||
if (!recipe) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
||||
|
||||
const result = await estimateNutrition({
|
||||
title: recipe.title,
|
||||
baseServings: recipe.baseServings,
|
||||
ingredients: recipe.ingredients.map((i) => ({
|
||||
rawName: i.rawName,
|
||||
quantity: i.quantity,
|
||||
unit: i.unit,
|
||||
})),
|
||||
});
|
||||
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro", () =>
|
||||
estimateNutrition({
|
||||
title: recipe.title,
|
||||
baseServings: recipe.baseServings,
|
||||
ingredients: recipe.ingredients.map((i) => ({
|
||||
rawName: i.rawName,
|
||||
quantity: i.quantity,
|
||||
unit: i.unit,
|
||||
})),
|
||||
})
|
||||
);
|
||||
if (!result.ok) return result.response;
|
||||
|
||||
await db.update(recipes).set({ nutritionData: result }).where(and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)));
|
||||
await db.update(recipes).set({ nutritionData: result.data }).where(and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)));
|
||||
|
||||
return NextResponse.json({ nutrition: result });
|
||||
return NextResponse.json({ nutrition: result.data });
|
||||
}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { db, recipes, recipeIngredients, recipeSteps, recipeSnapshots } from "@epicure/db";
|
||||
import { eq, and, max } from "@epicure/db";
|
||||
import { db, recipes, recipeIngredients, recipeSteps, recipeSnapshots, ratings } from "@epicure/db";
|
||||
import { eq, and, max, isNotNull } from "@epicure/db";
|
||||
import { z } from "zod";
|
||||
import { requireSessionOrApiKey } from "@/lib/api-auth";
|
||||
import { deleteObject } from "@/lib/storage";
|
||||
import { dispatchWebhook } from "@/lib/webhooks";
|
||||
import { parseQuantity } from "@/lib/parse-quantity";
|
||||
|
||||
@@ -69,41 +70,6 @@ export async function PUT(req: NextRequest, { params }: Params) {
|
||||
});
|
||||
if (!existing) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
||||
|
||||
// Create a snapshot of the current state before updating
|
||||
const [maxVersionRow] = await db
|
||||
.select({ v: max(recipeSnapshots.version) })
|
||||
.from(recipeSnapshots)
|
||||
.where(eq(recipeSnapshots.recipeId, id));
|
||||
const nextVersion = (maxVersionRow?.v ?? 0) + 1;
|
||||
await db.insert(recipeSnapshots).values({
|
||||
id: crypto.randomUUID(),
|
||||
recipeId: id,
|
||||
authorId: session!.user.id,
|
||||
version: nextVersion,
|
||||
title: existing.title,
|
||||
snapshotData: {
|
||||
title: existing.title,
|
||||
description: existing.description,
|
||||
baseServings: existing.baseServings,
|
||||
difficulty: existing.difficulty,
|
||||
prepMins: existing.prepMins,
|
||||
cookMins: existing.cookMins,
|
||||
dietaryTags: existing.dietaryTags ?? {},
|
||||
ingredients: existing.ingredients.map((i) => ({
|
||||
rawName: i.rawName,
|
||||
quantity: i.quantity,
|
||||
unit: i.unit,
|
||||
note: i.note,
|
||||
order: i.order,
|
||||
})),
|
||||
steps: existing.steps.map((s) => ({
|
||||
instruction: s.instruction,
|
||||
timerSeconds: s.timerSeconds,
|
||||
order: s.order,
|
||||
})),
|
||||
},
|
||||
});
|
||||
|
||||
const body = await req.json() as unknown;
|
||||
const parsed = UpdateRecipeSchema.safeParse(body);
|
||||
if (!parsed.success) {
|
||||
@@ -113,6 +79,41 @@ export async function PUT(req: NextRequest, { params }: Params) {
|
||||
const data = parsed.data;
|
||||
|
||||
await db.transaction(async (tx) => {
|
||||
// Create a snapshot of the current state before updating
|
||||
const [maxVersionRow] = await tx
|
||||
.select({ v: max(recipeSnapshots.version) })
|
||||
.from(recipeSnapshots)
|
||||
.where(eq(recipeSnapshots.recipeId, id));
|
||||
const nextVersion = (maxVersionRow?.v ?? 0) + 1;
|
||||
await tx.insert(recipeSnapshots).values({
|
||||
id: crypto.randomUUID(),
|
||||
recipeId: id,
|
||||
authorId: session!.user.id,
|
||||
version: nextVersion,
|
||||
title: existing.title,
|
||||
snapshotData: {
|
||||
title: existing.title,
|
||||
description: existing.description,
|
||||
baseServings: existing.baseServings,
|
||||
difficulty: existing.difficulty,
|
||||
prepMins: existing.prepMins,
|
||||
cookMins: existing.cookMins,
|
||||
dietaryTags: existing.dietaryTags ?? {},
|
||||
ingredients: existing.ingredients.map((i) => ({
|
||||
rawName: i.rawName,
|
||||
quantity: i.quantity,
|
||||
unit: i.unit,
|
||||
note: i.note,
|
||||
order: i.order,
|
||||
})),
|
||||
steps: existing.steps.map((s) => ({
|
||||
instruction: s.instruction,
|
||||
timerSeconds: s.timerSeconds,
|
||||
order: s.order,
|
||||
})),
|
||||
},
|
||||
});
|
||||
|
||||
const updates: Partial<typeof recipes.$inferInsert> = { updatedAt: new Date() };
|
||||
if (data.title !== undefined) updates.title = data.title;
|
||||
if (data.description !== undefined) updates.description = data.description;
|
||||
@@ -161,6 +162,9 @@ export async function PUT(req: NextRequest, { params }: Params) {
|
||||
|
||||
const updated = await getOwnedRecipe(id, session!.user.id);
|
||||
void dispatchWebhook(session!.user.id, "recipe.updated", { id, title: updated?.title });
|
||||
if (existing.visibility === "private" && data.visibility === "public") {
|
||||
void dispatchWebhook(session!.user.id, "recipe.published", { id, title: updated?.title });
|
||||
}
|
||||
return NextResponse.json(updated);
|
||||
}
|
||||
|
||||
@@ -171,10 +175,33 @@ export async function DELETE(req: NextRequest, { params }: Params) {
|
||||
|
||||
const existing = await db.query.recipes.findFirst({
|
||||
where: and(eq(recipes.id, id), eq(recipes.authorId, session!.user.id)),
|
||||
with: { photos: true },
|
||||
});
|
||||
if (!existing) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
||||
|
||||
// Collect storage keys before the cascade delete removes the rows.
|
||||
// recipeSteps.photoUrl stores a full URL rather than a storage key, so it
|
||||
// is intentionally not deleted here — only objects this app stored by key.
|
||||
const reviewPhotos = await db
|
||||
.select({ photoKey: ratings.photoKey })
|
||||
.from(ratings)
|
||||
.where(and(eq(ratings.recipeId, id), isNotNull(ratings.photoKey)));
|
||||
const storageKeys = [
|
||||
...existing.photos.map((p) => p.storageKey),
|
||||
...reviewPhotos.map((r) => r.photoKey).filter((k): k is string => k !== null),
|
||||
];
|
||||
|
||||
await db.delete(recipes).where(eq(recipes.id, id));
|
||||
|
||||
// Best-effort object cleanup: a storage failure must not fail the response.
|
||||
for (const key of storageKeys) {
|
||||
try {
|
||||
await deleteObject(key);
|
||||
} catch (err) {
|
||||
console.error(`Failed to delete storage object ${key} for recipe ${id}`, err);
|
||||
}
|
||||
}
|
||||
|
||||
void dispatchWebhook(session!.user.id, "recipe.deleted", { id });
|
||||
return new NextResponse(null, { status: 204 });
|
||||
}
|
||||
|
||||
@@ -55,41 +55,6 @@ export async function POST(req: NextRequest, { params }: Params) {
|
||||
});
|
||||
if (!snapshot) return NextResponse.json({ error: "Snapshot not found" }, { status: 404 });
|
||||
|
||||
// Create a snapshot of the current state before restoring
|
||||
const [maxVersionRow] = await db
|
||||
.select({ v: max(recipeSnapshots.version) })
|
||||
.from(recipeSnapshots)
|
||||
.where(eq(recipeSnapshots.recipeId, id));
|
||||
const nextVersion = (maxVersionRow?.v ?? 0) + 1;
|
||||
await db.insert(recipeSnapshots).values({
|
||||
id: crypto.randomUUID(),
|
||||
recipeId: id,
|
||||
authorId: session!.user.id,
|
||||
version: nextVersion,
|
||||
title: currentRecipe.title,
|
||||
snapshotData: {
|
||||
title: currentRecipe.title,
|
||||
description: currentRecipe.description,
|
||||
baseServings: currentRecipe.baseServings,
|
||||
difficulty: currentRecipe.difficulty,
|
||||
prepMins: currentRecipe.prepMins,
|
||||
cookMins: currentRecipe.cookMins,
|
||||
dietaryTags: currentRecipe.dietaryTags ?? {},
|
||||
ingredients: currentRecipe.ingredients.map((i) => ({
|
||||
rawName: i.rawName,
|
||||
quantity: i.quantity,
|
||||
unit: i.unit,
|
||||
note: i.note,
|
||||
order: i.order,
|
||||
})),
|
||||
steps: currentRecipe.steps.map((s) => ({
|
||||
instruction: s.instruction,
|
||||
timerSeconds: s.timerSeconds,
|
||||
order: s.order,
|
||||
})),
|
||||
},
|
||||
});
|
||||
|
||||
// Restore the recipe from the snapshot
|
||||
const data = snapshot.snapshotData as {
|
||||
title: string;
|
||||
|
||||
Reference in New Issue
Block a user