Final pass over the unaddressed AUDIT-2026-05-12 dossiers, taking the
tractable Critical/High items from each:
error-ux-auditor (5 items)
- C2: 17 toast.error(err.message) sites swept to toastError(err, …) so
every user-visible failure carries a copy-paste Reference ID
- C3: apiFetch synthesizes a client-side correlation id when a 5xx
comes back with a non-JSON body (reverse-proxy HTML pages); message
becomes "The server is unreachable. Please try again." with code
UPSTREAM_UNREACHABLE
- C4: checkRateLimit fails OPEN when Redis is unavailable so an outage
no longer 500s login + portal sign-in; logged at warn so monitoring
catches it
- H2: StorageTimeoutError (name='TimeoutError') replaces the plain
Error throw in s3.ts withTimeout — error-classifier hints fire now
- H5: errorResponse() adopted across /api/storage/[token],
/api/public/website-inquiries, and the Documenso webhook body (drops
the "Invalid secret" reconnaissance string)
outbound-webhook-auditor (5 items)
- C1: signature is now HMAC(secret, `${ts}.${body}`) with the
timestamp surfaced as X-Webhook-Timestamp so receivers can reject
replays outside a freshness window
- C3: dead-letter with reason missing_signing_secret when secret is
null (defence-in-depth against DB tampering / future migration
mistakes)
- H2: webhooks queue bumped to maxAttempts=8 with 30 s base
exponential backoff so a 30 s receiver blip during a deploy no
longer dead-letters every in-flight event; per-queue
backoffDelayMs added to QUEUE_CONFIGS
- M1: SSRF denylist gains Oracle Cloud metadata 192.0.0.192
- M2: dispatch-time https:// assertion before fetch, so a bad DB edit
can't slip plaintext through
storage-pathing-auditor (2 items)
- H1: berth-PDF presigned-upload keys now `${portSlug}/berths/…/…`
with portSlug threaded into backend.presignUpload — engages the
filesystem-proxy port-binding `p` token verifier
- H2: presignDownloadUrl auto-derives portSlug from the key's first
segment when callers don't pass it, so all 8 download sites engage
the `p`-token guard without per-site plumbing
search-auditor (1 item)
- H3: removed dead void wantEmail; void wantPhone; pair plus the
unused looksLikeEmail helper — the bucket-reorder it was scaffolded
for was never wired
maintainability-auditor (1 item)
- M2: swept seven abandoned `void <symbol>` markers and their dead
imports across clients/bulk, interests/bulk, admin/email-templates,
admin/website-submissions, alert-rules, and notes.service
Deferred to future work (substantial refactors, schema migrations, or
multi-file UI work):
- error-ux M3-M8 (global-error.tsx, per-route loading.tsx coverage,
ErrorBanner component, /api/ready route, worker DLQ admin surface)
- maintainability C1-C4 (documents/search/notes service splits,
interest-tabs split — multi-hour refactors)
- currency C1-H5 (mixed-currency dashboard aggregation, FX history
table, rounding policy) — wait for second non-USD port
- outbound-webhook C2 (deliveries reaper job), H1 (DNS-rebind TOCTOU
with undici Agent), H3 (circuit-breaker), H5 (presigned-post-policy)
- storage-pathing C2 (orphan reaper), H3-H5 (streaming + content-type
binding)
Tests: 1315/1315 vitest ✅ ; tsc clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
239 lines
9.0 KiB
TypeScript
239 lines
9.0 KiB
TypeScript
/**
|
|
* Filesystem-backend download proxy.
|
|
*
|
|
* The `FilesystemBackend.presignDownload(...)` returns a CRM-internal URL of
|
|
* the form `/api/storage/<hmac-signed-token>`. This route verifies the HMAC,
|
|
* checks expiry, enforces single-use via a short Redis cache, then streams
|
|
* the file out with explicit `Content-Type` + `Content-Disposition`.
|
|
*
|
|
* §14.9a mitigations exercised here:
|
|
* - HMAC verification (timingSafeEqual via filesystem.verifyProxyToken)
|
|
* - expiry check (token includes `e` epoch seconds)
|
|
* - single-use replay protection via short Redis SET-NX
|
|
* - Node runtime only (no edge); explicit headers so Next.js doesn't try to
|
|
* process the bytes (no image optimization, no streaming transforms)
|
|
*/
|
|
|
|
import { createReadStream } from 'node:fs';
|
|
import * as fs from 'node:fs/promises';
|
|
import { Readable } from 'node:stream';
|
|
|
|
import { NextRequest, NextResponse } from 'next/server';
|
|
|
|
import { MAX_FILE_SIZE } from '@/lib/constants/file-validation';
|
|
import {
|
|
AppError,
|
|
errorResponse,
|
|
ForbiddenError,
|
|
NotFoundError,
|
|
ValidationError,
|
|
} from '@/lib/errors';
|
|
import { logger } from '@/lib/logger';
|
|
import { redis } from '@/lib/redis';
|
|
import { FilesystemBackend, getStorageBackend } from '@/lib/storage';
|
|
import { verifyProxyToken } from '@/lib/storage/filesystem';
|
|
import { isPdfMagic } from '@/lib/services/berth-pdf-parser';
|
|
|
|
export const runtime = 'nodejs';
|
|
export const dynamic = 'force-dynamic';
|
|
|
|
// Replay-protection TTL must outlive the token itself, otherwise the
|
|
// dedup key expires and the same token can be redeemed twice. We pin it
|
|
// to the token's own expiry (clamped to a 25-day ceiling so a forged
|
|
// far-future token can't pollute Redis indefinitely). Send-out emails
|
|
// mint 24-hour tokens so the typical TTL is 24h + a small buffer.
|
|
const REPLAY_TTL_FLOOR_SECONDS = 60; // never below 60s (post-expiry tail).
|
|
const REPLAY_TTL_CEILING_SECONDS = 25 * 24 * 60 * 60; // 25 days.
|
|
|
|
export async function GET(
|
|
_req: NextRequest,
|
|
ctx: { params: Promise<{ token: string }> },
|
|
): Promise<NextResponse> {
|
|
const { token } = await ctx.params;
|
|
|
|
const backend = await getStorageBackend();
|
|
if (!(backend instanceof FilesystemBackend)) {
|
|
return errorResponse(new NotFoundError('storage proxy'));
|
|
}
|
|
|
|
const result = verifyProxyToken(token, backend.getHmacSecret(), 'get');
|
|
if (!result.ok) {
|
|
logger.warn({ reason: result.reason }, 'Storage proxy token rejected');
|
|
return errorResponse(new ForbiddenError('Invalid or expired token'));
|
|
}
|
|
const { payload } = result;
|
|
|
|
// Single-use enforcement. SET NX with a TTL pinned to the token's own
|
|
// expiry so the dedup window never closes before the token does. Using
|
|
// the body half of the token as the dedup key (signature included
|
|
// would also work but body is enough — a reused token has the same body).
|
|
const replayKey = `storage:proxy:seen:${token.split('.')[0]}`;
|
|
const remainingSeconds = Math.max(
|
|
REPLAY_TTL_FLOOR_SECONDS,
|
|
Math.min(REPLAY_TTL_CEILING_SECONDS, payload.e - Math.floor(Date.now() / 1000) + 60),
|
|
);
|
|
const setOk = await redis.set(replayKey, '1', 'EX', remainingSeconds, 'NX');
|
|
if (setOk !== 'OK') {
|
|
logger.warn({ key: payload.k }, 'Storage proxy token replay rejected');
|
|
return errorResponse(new ForbiddenError('Token already used'));
|
|
}
|
|
|
|
let absolutePath: string;
|
|
try {
|
|
absolutePath = backend.resolveKeyForProxy(payload.k);
|
|
} catch (err) {
|
|
logger.warn({ err, key: payload.k }, 'Storage proxy key resolution failed');
|
|
return errorResponse(new ValidationError('Invalid key'));
|
|
}
|
|
|
|
let size: number;
|
|
try {
|
|
const stat = await fs.stat(absolutePath);
|
|
if (!stat.isFile()) {
|
|
return errorResponse(new NotFoundError('file'));
|
|
}
|
|
size = stat.size;
|
|
} catch (err) {
|
|
const code = (err as NodeJS.ErrnoException).code;
|
|
if (code === 'ENOENT') {
|
|
return errorResponse(new NotFoundError('file'));
|
|
}
|
|
return errorResponse(err);
|
|
}
|
|
|
|
// Convert the Node Readable into a Web ReadableStream for NextResponse.
|
|
const nodeStream = createReadStream(absolutePath);
|
|
const webStream = Readable.toWeb(nodeStream) as unknown as ReadableStream<Uint8Array>;
|
|
|
|
const headers = new Headers();
|
|
headers.set('Content-Type', payload.c ?? 'application/octet-stream');
|
|
headers.set('Content-Length', String(size));
|
|
if (payload.f) {
|
|
// RFC 5987 — quote the filename and provide a UTF-8 fallback.
|
|
const safe = payload.f.replace(/"/g, '');
|
|
headers.set(
|
|
'Content-Disposition',
|
|
`attachment; filename="${safe}"; filename*=UTF-8''${encodeURIComponent(payload.f)}`,
|
|
);
|
|
}
|
|
headers.set('Cache-Control', 'private, no-store');
|
|
headers.set('X-Content-Type-Options', 'nosniff');
|
|
|
|
return new NextResponse(webStream, { status: 200, headers });
|
|
}
|
|
|
|
/**
|
|
* Filesystem-backend upload proxy. The presigned URL minted by
|
|
* `FilesystemBackend.presignUpload` points here. Without this handler the
|
|
* browser-driven berth-PDF / brochure uploads would 405 in filesystem
|
|
* deployments — the entire pluggable-storage abstraction relied on the
|
|
* GET-only counterpart for downloads.
|
|
*
|
|
* Same token-verify + single-use replay protection as GET, plus:
|
|
* - Hard size cap (rejects oversized bodies before any disk I/O).
|
|
* - Magic-byte check when the issuer declared content-type=application/pdf
|
|
* (matches the §14.6 §6c/§7c invariant: every upload path verifies
|
|
* bytes server-side, not just at the client).
|
|
*/
|
|
export async function PUT(
|
|
req: NextRequest,
|
|
ctx: { params: Promise<{ token: string }> },
|
|
): Promise<NextResponse> {
|
|
const { token } = await ctx.params;
|
|
|
|
const backend = await getStorageBackend();
|
|
if (!(backend instanceof FilesystemBackend)) {
|
|
return errorResponse(new NotFoundError('storage proxy'));
|
|
}
|
|
|
|
const result = verifyProxyToken(token, backend.getHmacSecret(), 'put');
|
|
if (!result.ok) {
|
|
logger.warn({ reason: result.reason }, 'Storage proxy upload token rejected');
|
|
return errorResponse(new ForbiddenError('Invalid or expired token'));
|
|
}
|
|
const { payload } = result;
|
|
|
|
// Separate replay namespace from GET so a token can validly serve one
|
|
// upload AND one download (the issuer only mints the second), but a
|
|
// PUT cannot be replayed against itself.
|
|
const replayKey = `storage:proxy:put:${token.split('.')[0]}`;
|
|
const remainingSeconds = Math.max(
|
|
REPLAY_TTL_FLOOR_SECONDS,
|
|
Math.min(REPLAY_TTL_CEILING_SECONDS, payload.e - Math.floor(Date.now() / 1000) + 60),
|
|
);
|
|
const setOk = await redis.set(replayKey, '1', 'EX', remainingSeconds, 'NX');
|
|
if (setOk !== 'OK') {
|
|
logger.warn({ key: payload.k }, 'Storage proxy upload token replay rejected');
|
|
return errorResponse(new ForbiddenError('Token already used'));
|
|
}
|
|
|
|
// Pre-flight size check via Content-Length so a malicious caller can't
|
|
// exhaust disk by streaming hundreds of MB before we look at the body.
|
|
const contentLengthHeader = req.headers.get('content-length');
|
|
const contentLength = contentLengthHeader ? Number(contentLengthHeader) : NaN;
|
|
if (Number.isFinite(contentLength) && contentLength > MAX_FILE_SIZE) {
|
|
return errorResponse(
|
|
new AppError(
|
|
413,
|
|
`File exceeds ${MAX_FILE_SIZE} byte cap (Content-Length: ${contentLength})`,
|
|
'PAYLOAD_TOO_LARGE',
|
|
),
|
|
);
|
|
}
|
|
|
|
if (!req.body) {
|
|
return errorResponse(new ValidationError('Empty body'));
|
|
}
|
|
|
|
// Read the body into a buffer with a hard cap. Filesystem deployments are
|
|
// small-tenant (single-node only — see FilesystemBackend boot guard) so
|
|
// 50 MB ceiling fits comfortably in heap; no streaming needed.
|
|
let buffer: Buffer;
|
|
try {
|
|
const chunks: Buffer[] = [];
|
|
let total = 0;
|
|
const reader = req.body.getReader();
|
|
while (true) {
|
|
const { done, value } = await reader.read();
|
|
if (done) break;
|
|
total += value.byteLength;
|
|
if (total > MAX_FILE_SIZE) {
|
|
try {
|
|
await reader.cancel();
|
|
} catch {
|
|
/* ignore */
|
|
}
|
|
return errorResponse(
|
|
new AppError(413, `File exceeds ${MAX_FILE_SIZE} byte cap`, 'PAYLOAD_TOO_LARGE'),
|
|
);
|
|
}
|
|
chunks.push(Buffer.from(value));
|
|
}
|
|
buffer = Buffer.concat(chunks);
|
|
} catch (err) {
|
|
logger.warn({ err, key: payload.k }, 'Storage proxy upload read failed');
|
|
return errorResponse(new ValidationError('Upload read failed'));
|
|
}
|
|
|
|
// Magic-byte gate: when the token was minted with `c=application/pdf`
|
|
// (the only consumer today — berth PDFs + brochures), refuse anything
|
|
// that isn't actually a PDF. Mirrors the post-upload check in
|
|
// berth-pdf.service.ts so the two paths behave identically.
|
|
if (payload.c === 'application/pdf' && !isPdfMagic(buffer)) {
|
|
return errorResponse(
|
|
new ValidationError('Uploaded file failed PDF magic-byte check (does not start with %PDF-).'),
|
|
);
|
|
}
|
|
|
|
try {
|
|
await backend.put(payload.k, buffer, {
|
|
contentType: payload.c ?? 'application/octet-stream',
|
|
});
|
|
} catch (err) {
|
|
logger.error({ err, key: payload.k }, 'Storage proxy upload write failed');
|
|
return errorResponse(err);
|
|
}
|
|
|
|
return NextResponse.json({ ok: true, key: payload.k, sizeBytes: buffer.length }, { status: 200 });
|
|
}
|