ADDED - Admin SEO page, robots/sitemap hardening and media/maintenance security fixes
SEO - New Settings > SEO admin page (seo_settings in app_config): indexing switch, Google/Bing verification, X handle, JSON-LD identity (Person/Organization, sameAs), per-locale keywords, readiness checklist and open links for sitemap.xml / robots.txt / manifest. - robots.txt is now dynamic: disallows admin, api, success and coming-soon paths; blocks everything while indexing is off or maintenance is on. - sitemap.xml carries hreflang alternates per URL, lists only categories with published projects, and is empty while hidden. - Metadata: robots + verification meta, og:locale in de_DE/en_US/ar_AR form, alternateLocale, twitter site/creator, project cover as OG image with article type, noindex on /success and /coming-soon. - JSON-LD: WebSite + publisher graph on all public pages, CreativeWork per project (view-mode independent). Security - Maintenance bypass now requires a correctly signed admin cookie; the middleware previously only checked the cookie existed. Token helpers moved to lib/admin-session-token.ts (shared by proxy.ts and lib/admin-auth.ts). - Media uploads: magic-byte validation against the declared type, SVG sanitization (script/handlers/foreignObject/javascript: rejected), upload folder sanitized, kind inferred from the real file. - Media route: fixed prefix-based path check that accepted sibling directories, unknown extensions return 404, nosniff header, CSP sandbox on SVG, gif content type added. - External media URLs: protocol-relative (//host) URLs rejected. Portfolio - Project and category slugs share /portfolio/[slug]; saving now rejects a slug already used on the other side instead of silently shadowing it. Tooling/docs - Lint: ignore scripts/legacy-prisma-seed.cjs, drop unused import. - New docs/SEO.md; FEATURES, ARCHITECTURE (Drizzle instead of Prisma), admin spec and CLAUDE.md updated. - Tests for all of the above (unit + integration); suite green.
This commit is contained in:
+61
-5
@@ -37,16 +37,65 @@ export function resolveMediaUploadPath(filePath: string) {
|
||||
throw new Error("Only managed media uploads can be resolved.");
|
||||
}
|
||||
|
||||
const relativePath = filePath.replace("/uploads/media/", "");
|
||||
const relativePath = filePath.slice("/uploads/media/".length);
|
||||
|
||||
if (!relativePath || relativePath.includes("\0")) {
|
||||
throw new Error("Resolved media upload path escapes the upload root.");
|
||||
}
|
||||
|
||||
const absolutePath = path.resolve(MEDIA_UPLOAD_ROOT, relativePath);
|
||||
|
||||
if (!absolutePath.startsWith(MEDIA_UPLOAD_ROOT)) {
|
||||
// `startsWith(root)` alone would accept a sibling directory such as
|
||||
// `.../uploads/media-evil/...`; require the separator so only true children pass.
|
||||
if (absolutePath !== MEDIA_UPLOAD_ROOT && !absolutePath.startsWith(MEDIA_UPLOAD_ROOT + path.sep)) {
|
||||
throw new Error("Resolved media upload path escapes the upload root.");
|
||||
}
|
||||
|
||||
if (absolutePath === MEDIA_UPLOAD_ROOT) {
|
||||
throw new Error("Resolved media upload path escapes the upload root.");
|
||||
}
|
||||
|
||||
return absolutePath;
|
||||
}
|
||||
|
||||
const MAGIC_SIGNATURES: Record<string, Array<{ offset: number; bytes: number[] }>> = {
|
||||
".png": [{ offset: 0, bytes: [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a] }],
|
||||
".jpg": [{ offset: 0, bytes: [0xff, 0xd8, 0xff] }],
|
||||
".gif": [{ offset: 0, bytes: [0x47, 0x49, 0x46, 0x38] }],
|
||||
".webp": [
|
||||
{ offset: 0, bytes: [0x52, 0x49, 0x46, 0x46] },
|
||||
{ offset: 8, bytes: [0x57, 0x45, 0x42, 0x50] },
|
||||
],
|
||||
".pdf": [{ offset: 0, bytes: [0x25, 0x50, 0x44, 0x46] }],
|
||||
".ico": [{ offset: 0, bytes: [0x00, 0x00, 0x01, 0x00] }],
|
||||
};
|
||||
|
||||
const SVG_FORBIDDEN_PATTERN = /<script[\s>]|javascript:|on[a-z]+\s*=|<foreignObject|<iframe|<embed|<object|xlink:href\s*=\s*["']\s*(?!#|data:image\/)/i;
|
||||
|
||||
/**
|
||||
* Verify that the file bytes match the extension derived from the declared
|
||||
* MIME type. The browser-supplied `file.type` is untrusted: without this check
|
||||
* an HTML/JS payload could be stored as `.png` and served from our origin.
|
||||
*/
|
||||
export function isMediaContentValid(extension: string, buffer: Buffer): boolean {
|
||||
if (extension === ".svg") {
|
||||
const head = buffer.subarray(0, 4096).toString("utf8").trimStart();
|
||||
const looksLikeSvg = head.startsWith("<svg") || (head.startsWith("<?xml") && /<svg[\s>]/i.test(head));
|
||||
|
||||
return looksLikeSvg && !SVG_FORBIDDEN_PATTERN.test(buffer.toString("utf8"));
|
||||
}
|
||||
|
||||
const signatures = MAGIC_SIGNATURES[extension];
|
||||
|
||||
if (!signatures) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return signatures.every(({ offset, bytes }) =>
|
||||
bytes.every((byte, index) => buffer[offset + index] === byte),
|
||||
);
|
||||
}
|
||||
|
||||
export async function removeManagedMediaFile(filePath: string | null | undefined) {
|
||||
if (!isManagedMediaFilePath(filePath)) {
|
||||
return false;
|
||||
@@ -76,16 +125,23 @@ export async function saveMediaUpload(file: File, folder: string) {
|
||||
throw new Error("File is too large.");
|
||||
}
|
||||
|
||||
const buffer = Buffer.from(await file.arrayBuffer());
|
||||
|
||||
if (!isMediaContentValid(extension, buffer)) {
|
||||
throw new Error("File content does not match its declared type.");
|
||||
}
|
||||
|
||||
const safeFolder = sanitizeBaseName(folder) || "misc";
|
||||
const safeBaseName = sanitizeBaseName(file.name.replace(/\.[^.]+$/, "")) || "asset";
|
||||
const finalName = `${safeBaseName}-${randomUUID().slice(0, 8)}${extension}`;
|
||||
const targetDir = path.join(MEDIA_UPLOAD_ROOT, folder);
|
||||
const targetDir = path.join(MEDIA_UPLOAD_ROOT, safeFolder);
|
||||
const targetPath = path.join(targetDir, finalName);
|
||||
|
||||
await mkdir(targetDir, { recursive: true });
|
||||
await writeFile(targetPath, Buffer.from(await file.arrayBuffer()));
|
||||
await writeFile(targetPath, buffer);
|
||||
|
||||
return {
|
||||
url: `/uploads/media/${folder}/${finalName}`,
|
||||
url: `/uploads/media/${safeFolder}/${finalName}`,
|
||||
fileName: finalName,
|
||||
mimeType: file.type,
|
||||
size: file.size,
|
||||
|
||||
Reference in New Issue
Block a user