Arnaud
3042d289a0
Full list of the audit's confirmed findings and their fixes: - Stored XSS via unescaped JSON-LD on the public recipe page (app/r/[id]/page.tsx) — escape < before injecting. - CSP allowed unsafe-eval in production — now dev-only (Next prod never eval()s; only its HMR does). - avatarUrl accepted any URL with no ownership check — now takes an avatarKey issued by avatar-presign, validated server-side, same pattern as recipe/review photos. - No session revocation on password change/reset — both now revoke other sessions (revokeOtherSessions: true, revokeSessionsOnPasswordReset). - Rate-limit bypass via spoofable X-Forwarded-For — take the last (proxy-appended) hop instead of the first (client-supplied) one, matching the single-Traefik-hop topology. - Webhook signing secrets stored plaintext — now AES-256-GCM encrypted like every other secret in this app, with a legacy- plaintext fallback for pre-existing rows (bare hex has no ":", our ciphertext format always does). - Better Auth's own rate limiter defaulted to in-memory storage, ineffective across replicas — now backed by the same Redis as lib/rate-limit.ts (secondaryStorage), with storeSessionInDatabase explicit so session storage itself doesn't move as a side effect. - Presigned upload URLs didn't bind the declared file size to the actual upload, letting a client under-declare size (and quota charge) then PUT an arbitrarily large object — switched to S3 presigned POST with a signed content-length-range condition, enforced by the storage server itself. - generateMetadata() on the recipe page skipped the visibility filter the page body uses, leaking a private recipe's title via <title> to any signed-in user with the id. - Block/unblock had no rate limit, unlike follow/unfollow. - AI quota was charged even when a user's own BYOK key was used (their own credentials/billing) — added an isByok flag through the config-resolution chain and skip the charge when set. Also wired BYOK into generate/generate-from-idea/translate/import-url, which never looked it up at all before. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
80 lines
2.8 KiB
TypeScript
80 lines
2.8 KiB
TypeScript
import { NextResponse } from "next/server";
|
|
import { APICallError } from "ai";
|
|
import { checkAndIncrementTierLimit, refundAiCall, TierLimitError } from "@/lib/tiers";
|
|
import { ByokDecryptError } from "@/lib/ai/resolve-user-key";
|
|
|
|
/**
|
|
* Maps an AI-call failure to a clean JSON response instead of letting the
|
|
* raw provider error (which can include internal provider names/payloads)
|
|
* reach the client or crash the route as an uncaught 500.
|
|
*/
|
|
export function aiErrorResponse(err: unknown): NextResponse {
|
|
if (APICallError.isInstance(err)) {
|
|
return NextResponse.json(
|
|
{
|
|
error: err.isRetryable
|
|
? "The AI provider is temporarily unavailable. Please try again in a moment."
|
|
: "The AI provider rejected this request. Try switching models in Settings.",
|
|
retryable: err.isRetryable,
|
|
},
|
|
{ status: err.isRetryable ? 503 : 502 }
|
|
);
|
|
}
|
|
|
|
return NextResponse.json({ error: "AI request failed. Please try again." }, { status: 502 });
|
|
}
|
|
|
|
/**
|
|
* Resolves a BYOK/model config and converts a decrypt failure into a clean
|
|
* 400 response instead of letting it throw uncaught (or letting the caller
|
|
* silently fall back to the platform key/billing).
|
|
*/
|
|
export async function resolveAiConfigOrError<T>(resolve: () => Promise<T>): Promise<{ ok: true; data: T } | { ok: false; response: NextResponse }> {
|
|
try {
|
|
return { ok: true, data: await resolve() };
|
|
} catch (err) {
|
|
if (err instanceof ByokDecryptError) {
|
|
return { ok: false, response: NextResponse.json({ error: err.message }, { status: 400 }) };
|
|
}
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
type QuotaResult<T> = { ok: true; data: T } | { ok: false; response: NextResponse };
|
|
|
|
/**
|
|
* Charges one aiCall credit, runs `fn`, and refunds the credit if `fn`
|
|
* throws — so a provider outage never silently burns a user's quota.
|
|
* Centralizes the TierLimitError → 403 and AI-failure → clean-JSON mapping
|
|
* that every AI route needs instead of repeating try/catch per route.
|
|
*
|
|
* Pass `skipQuota: true` when the resolved AiConfig used the caller's own
|
|
* BYOK key (config.isByok) — it's their own credentials/billing, so it
|
|
* shouldn't count against the platform's monthly AI-call limit.
|
|
*/
|
|
export async function withAiQuota<T>(
|
|
userId: string,
|
|
tier: "free" | "pro",
|
|
fn: () => Promise<T>,
|
|
opts?: { skipQuota?: boolean }
|
|
): Promise<QuotaResult<T>> {
|
|
if (!opts?.skipQuota) {
|
|
try {
|
|
await checkAndIncrementTierLimit(userId, tier, "aiCall");
|
|
} catch (err) {
|
|
if (err instanceof TierLimitError) {
|
|
return { ok: false, response: NextResponse.json({ error: "AI call limit reached for your tier" }, { status: 403 }) };
|
|
}
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
try {
|
|
const data = await fn();
|
|
return { ok: true, data };
|
|
} catch (err) {
|
|
if (!opts?.skipQuota) await refundAiCall(userId);
|
|
return { ok: false, response: aiErrorResponse(err) };
|
|
}
|
|
}
|