Files
immich-folio/lib/contact.ts

234 lines
7.7 KiB
TypeScript
Raw Permalink Normal View History

release: v0.18.0 (#725) Release v0.18.0 — merges `dev` into `main`. ## Thanks - [@lancetm714](https://github.com/lancetm714) for the accent-contrast fix (#680 → #724). - [@RichKidsDev](https://github.com/RichKidsDev) for reporting the outdated Impressum (#697). ### Security - **Journal drafts and password-protected entries no longer render publicly as a subpage essay** ([#684](https://github.com/ralksta/immich-folio/pull/684), [GHSA-987w-cpwm-c9g9](https://github.com/ralksta/immich-folio/security/advisories/GHSA-987w-cpwm-c9g9), medium). A subpage's `essayFile` read the journal entry straight from disk, skipping the draft and password rules `/journal/<slug>` applies. It now resolves through the same rules: a draft reads as missing for visitors, and a protected entry shows its password gate, sharing the `lb_auth_journal_<slug>` cookie. - **Immich descriptions are escaped in generated subpage essays** ([#684](https://github.com/ralksta/immich-folio/pull/684), [GHSA-8ppx-39jv-q5xm](https://github.com/ralksta/immich-folio/security/advisories/GHSA-8ppx-39jv-q5xm), low). The essay built from a subpage's albums (`layout: essay` without markdown) put each asset's Immich description into the page as raw HTML. Captions are now HTML-escaped, and they go through `assetCaption()`, so `exif.caption: false` is respected there as well. Tracked in [#689](https://github.com/ralksta/immich-folio/issues/689). - **Admin drafts no longer keep a typed password, and the contact form's email check runs in linear time** ([#727](https://github.com/ralksta/immich-folio/pull/727)). The admin's session drafts wrote a password as typed to `sessionStorage`; a draft holding a plaintext password is now not kept (the unsaved-changes guard still warns). The email pattern could backtrack polynomially on a crafted domain; its labels now exclude the dot and the length is checked first. Both found by CodeQL before release. ### Added - **A built-in contact form with an inbox in the admin** ([#703](https://github.com/ralksta/immich-folio/pull/703), closes [#702](https://github.com/ralksta/immich-folio/issues/702)). `/contact` needs neither SMTP nor a form service: each message is one file in `content/messages/` (mode `0600`), read under the new _Messages_ tab, where _Reply by email_ opens the owner's mail client with the message quoted. Messages older than `contact.retentionDays` (default 90) are deleted. An optional ntfy push goes to `contact.notifyUrl` or `CONTACT_NOTIFY_URL`, and since [#709](https://github.com/ralksta/immich-folio/pull/709) it carries a fixed "new message" line and nothing about the sender — no name, no address, no text. Spam is kept out without a captcha: an off-screen honeypot, a minimum fill time, three submissions a minute per IP and a cap of 500 stored messages. With the Impressum on and no `legal.contactUrl`, the Impressum links the form as its second contact channel. A new doctor check warns when the form is on but nobody is notified. - **A privacy policy page, next to a list of what the site processes** ([#708](https://github.com/ralksta/immich-folio/pull/708)). `/privacy` renders `content/privacy.md`, edited under Settings → Legal, and the footer links it once the file has text; `privacy.enabled: false` hides it. Folio writes no legal text. Beside the editor it lists what _this_ installation does, read off the configuration — the map, statistics, contact form, password cookies, CDN — and marks every entry that involves a third party. _Insert headings_ adds the matching section headings and nothing else. The doctor warns while the Impressum is on and there is no policy. - **French, Spanish, Italian and Dutch interface translations** ([#681](https://github.com/ralksta/immich-folio/pull/681)), selected with `settings.yaml: lang` as before. The admin panel stays English. - **CDN mode for photos and videos** ([#681](https://github.com/ralksta/immich-folio/pull/681)). With `CDN_URL` set, image and video URLs point at a pull CDN whose origin is this server, so repeat views reach neither the server nor Immich. A site password switches the mode off, since a CDN would hand out cached photos without checking the unlock cookie. The CDN origin is added to the CSP, and a doctor check covers the password and `TRUSTED_PROXY_HOPS` cases. See `docs/deployment.md#cdn-mode`. - **A reworked admin panel** ([#712](https://github.com/ralksta/immich-folio/pull/712), [#713](https://github.com/ralksta/immich-folio/pull/713), [#714](https://github.com/ralksta/immich-folio/pull/714), [#716](https://github.com/ralksta/immich-folio/pull/716), [#717](https://github.com/ralksta/immich-folio/pull/717), [#718](https://github.com/ralksta/immich-folio/pull/718), [#719](https://github.com/ralksta/immich-folio/pull/719), [#721](https://github.com/ralksta/immich-folio/pull/721)): - **A sidebar instead of the header row**, grouped by task, with an unread count on Messages and a dot on Diagnostics while Immich is down. It collapses to an icon rail, with names shown on hover and focus, and remembers that per browser. - **`/admin` is an overview**: what needs attention (unread messages, doctor warnings), published pages, journal entries and recent views. - **The site's own visual language** — the preset's fonts, hairline borders, the square marker — and one page header on every screen. The accent is kept for the current place and the primary action; switches are now pills reading ON or OFF, in green rather than the accent, so Studio Modern's red no longer makes an enabled setting look like an error. - **The page builder is a structure list and a panel.** Hero, subpages and standalone albums sit in one list on the left, subpages drag-sorted in place; the selected entry is edited on the right instead of in an overlay. - **Dialogs only where a change is permanent.** Deleting a message or a journal entry, and resetting the favicon (which used to delete the file without asking), go through one confirm dialog in the admin's own look. Removals in the page builder, which only touch unsaved state, happen at once and offer _Undo_. No `window.confirm()` is left. - **Feature switches are grouped by meaning** as one-line rows under Settings → General; page transitions and scroll-to-top moved to Theme → Look & motion. No setting keys changed. ### Changed - **Fonts and the Leaflet stylesheet are served from the site itself** ([#700](https://github.com/ralksta/immich-folio/pull/700)). Every page used to link `fonts.googleapis.com`, which sends each visitor's IP address to Google. The server now fetches a theme's Google fonts once, rewrites the stylesheet and caches the files in `content/.fonts/`; custom fonts in `theme.fonts` keep working. If Google cannot be reached before a font is cached, the page falls back to the theme's system fonts. `leaflet.css` comes from the npm package instead of unpkg. The CSP drops `fonts.googleapis.com`, `fonts.gstatic.com` and `unpkg.com`. - **Email addresses are kept out of the served HTML** ([#705](https://github.com/ralksta/immich-folio/pull/705)). The Impressum and footer render the address only after hydration, from an encoded form, so harvesters reading raw HTML find nothing. Without JavaScript the Impressum shows `name [at] example [dot] de`. This defeats bulk harvesting, not a person with a browser. - **The Impressum cites § 5 DDG and links its contacts** ([#698](https://github.com/ralksta/immich-folio/pull/698), reported in [#697](https://github.com/ralksta/immich-folio/issues/697) by [@RichKidsDev](https://github.com/RichKidsDev)). The TMG was replaced by the DDG in May 2024; `legal.heading` replaces the line for other laws (e.g. § 5 ECG in Austria). `legal.contactUrl` and `legal.contactLabel` add a contact form as the second channel, so a phone number stays optional. Email, phone and contact URL are now links, and the "Created with the Impressum generator by eRecht24" line, shown on every site whether true or not, is gone. Settings → Legal gains fields for heading, contact URL, VAT ID and tax number, and a doctor check flags missing details. - **Missing pages answer `404`** ([#704](https://github.com/ralksta/immich-folio/pull/704)). Every missing page used to answer `200`, because streaming had started before `notFound()` ran. `/contact`, `/impressum`, `/map` and `/privacy` while switched off, and `/journal/<slug>` without an entry, now return a real 404 with the same not-found page. Album and subpage slugs still depend on Immich and stay soft 404s. - **Passwords set in the admin are stored as scrypt hashes** ([#706](https://github.com/ralksta/immich-folio/pull/706), closes [#690](https://github.com/ralksta/immich-folio/issues/690)). Subpage, album, journal-entry and site passwords were written as typed. The save routes now hash them; a stored hash reads _Protected_ with _Change_ and _Remove_ and is never put into an input. Visitors who unlocked a page stay signed in across unrelated saves. Existing plaintext passwords are hashed the next time their file is saved in the admin. - **One notification surface in the admin** ([#707](https://github.com/ralksta/immich-folio/pull/707)) replaces every `alert()`: errors stay until dismissed, successes clear themselves, and screen readers announce both. ### Fixed - **Map tiles load again** ([#701](https://github.com/ralksta/immich-folio/pull/701)). CARTO started answering every tile with an "API KEY REQUIRED" image, leaving `/map` and journal map blocks as a grey grid. Tiles now come from OpenStreetMap; the dark look is a CSS filter, so the map now follows the colour mode. - **The page builder no longer drops a subpage's `proofing:` flag on save** ([#711](https://github.com/ralksta/immich-folio/pull/711)). A page switched off for proofing by hand reverted after any unrelated edit. - **Unsaved edits in Settings and About survive switching admin tabs, and a backup restore is no longer overwritten by the next save** ([#687](https://github.com/ralksta/immich-folio/pull/687)). Editors that were open during a restore now reload and offer unsaved edits back as a conflict. Also: "Restore my changes" after a conflict found nothing, removing an album left its drawer showing the next album, and the journal saved (rotating a backup) without changes. - **Accent-backed buttons stay readable with a light or malformed accent** ([#724](https://github.com/ralksta/immich-folio/pull/724), supersedes [#680](https://github.com/ralksta/immich-folio/pull/680)) — contributed by [@lancetm714](https://github.com/lancetm714). A white accent made the proofing dialog's _Download selected (.zip)_ button white on white. `theme.accent` is now accepted as hex only and normalised to `#rrggbb`, anything else falls back to the preset, and the proofing dialog and filter pills use the mode-aware `--on-accent` text colour from #688. - **Every preset's accent is visible in both colour modes** ([#688](https://github.com/ralksta/immich-folio/pull/688)). Presets had one accent for both modes; minimal's dark mode drew black buttons on black. Presets now carry a light and a dark accent, and text on accent-filled buttons picks black or white for contrast. A custom accent stays the owner's choice in both modes. - **Visitor-side inconsistencies** ([#685](https://github.com/ralksta/immich-folio/pull/685)): after visiting `/impressum`, every subpage header turned centred and uppercase; back links announced "Back to Back to …"; the hero EXIF chip ignored `exif.location`/`camera`/`settings`; videos in journal entries opened as stills; the setup screen named a non-existent `.env.example`. - **An essay's lightbox walks only the photos the story shows** ([#686](https://github.com/ralksta/immich-folio/pull/686)), not every photo of the subpage's albums, and the proofing bar in essays shows the selection count instead of a filter button that did nothing. - **The page panel scrolls with the mouse wheel** ([#720](https://github.com/ralksta/immich-folio/pull/720)). - **The journal editor's top bar wraps on phones** ([#723](https://github.com/ralksta/immich-folio/pull/723), closes [#675](https://github.com/ralksta/immich-folio/issues/675)), so the title stays editable and Save stays on screen. - **Every admin form field has a name for assistive technology** ([#715](https://github.com/ralksta/immich-folio/pull/715)). Only two inputs had a linked label; 47 are linked now, and clicking a label focuses its field. ### Internal - **`SettingsEditor` and `PageBuilder` are split up** ([#710](https://github.com/ralksta/immich-folio/pull/710), [#711](https://github.com/ralksta/immich-folio/pull/711)). The 2,200-line settings editor is a shell with one file per section; the page builder's YAML handling and edits are pure functions under test. Both were checked side by side against `dev` for identical output. - **`useAdminFetch()`** ([#707](https://github.com/ralksta/immich-folio/pull/707)) gives Analytics, Messages, Backups and the journal list one loading and error pattern. - README brought up to v0.17.0 ([#678](https://github.com/ralksta/immich-folio/pull/678), [#679](https://github.com/ralksta/immich-folio/pull/679)). ### Upgrade notes **`content/` gains two directories the app writes to:** `content/.fonts/` for the cached fonts and `content/messages/` for contact-form messages. Both are created on demand, so a writable `content/` is enough, as before. **The server needs outbound HTTPS to Google once per font** to fill the font cache. Until then pages fall back to the theme's system fonts. Visitors' browsers no longer contact Google. **A custom CSP or reverse-proxy allowlist** must now allow `tile.openstreetmap.org` for images instead of `*.basemaps.cartocdn.com`, and no longer needs `fonts.googleapis.com`, `fonts.gstatic.com` or `unpkg.com`. The built-in CSP is updated. **`theme.accent` must be hex** (`#rgb`, `#rrggbb` or `#rrggbbaa`). Anything else, including a value without `#`, falls back to the preset's accent. **Plaintext passwords in `gallery.yaml`, `settings.yaml` or journal entries** are hashed the next time that file is saved in the admin; one save clears the doctor's warning. **New, optional settings:** `contact.*` (the form is off by default), `privacy.enabled`, `legal.heading`, `legal.contactUrl`, `legal.contactLabel`, and the `CDN_URL` and `CONTACT_NOTIFY_URL` environment variables. See `content/settings.yaml.example` and `.env.local.example`. In the example file, `vatId` and `taxId` had swapped sample values; check yours if you copied them. No `IMAGE_CACHE_VERSION` bump is needed this time. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: ralksta <ralksta@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Ralf <rohlenbo79@gmail.com> Co-authored-by: Paul Thies <110185070+ImScheinox@users.noreply.github.com> Co-authored-by: lancetm714 <108419425+lancetm714@users.noreply.github.com> Co-authored-by: Lance Martin <lancetaylor95@gmail.com>
2026-09-27 14:43:38 +02:00
/**
* The built-in contact form (#702): validation, storage and notification.
*
* Messages stay on this server, one JSON file each in `content/messages/`.
* No SMTP and no form service: the owner reads them in the admin panel and
* learns about new ones through an optional plain-text POST to
* `contact.notifyUrl` (an ntfy topic, typically). The notification carries
* nothing about the sender: no name, no address, no text. A push service is a
* third party, and a fixed "new message" needs no line in the privacy policy.
*
* Retention is enforced on every read and write rather than by a timer, so
* nothing older than `retentionDays` survives the next visit to the inbox or
* the next submission. The privacy policy can then state a fixed period.
*/
import crypto from 'node:crypto';
import fs from 'node:fs/promises';
import path from 'node:path';
export interface ContactMessage {
id: string;
/** ISO timestamp. */
receivedAt: string;
name: string;
email: string;
message: string;
read: boolean;
}
export interface ContactInput {
name?: unknown;
email?: unknown;
message?: unknown;
/** Honeypot: a field hidden from people. Anything in it means a bot. */
website?: unknown;
/** When the form was rendered (epoch ms), for the minimum fill time. */
startedAt?: unknown;
}
export const LIMITS = { name: 100, email: 200, message: 5000 } as const;
/** Faster than a person can type a message; slower than a bot posting on load. */
export const MIN_FILL_MS = 3000;
/** A form older than this was not filled in just now. */
const MAX_FILL_MS = 24 * 60 * 60 * 1000;
/**
* Hard cap on stored messages. A flood that gets past the rate limit fills the
* inbox and then stops, rather than filling the disk. New messages are refused
* at the cap instead of evicting old ones: a flood must not delete real mail.
*/
export const MAX_MESSAGES = 500;
const ID_RE = /^\d{13}-[a-f0-9]{8}$/;
// One `@`, a local part, and a domain of dot-separated labels. The labels
// exclude the dot, so each character can match only one way: the previous
// pattern let `[^…]+\.[^…]+` split a dotted domain in many places and ran in
// polynomial time on crafted input (CodeQL js/polynomial-redos).
const EMAIL_RE = /^[^\s@<>()[\]\\,;:"]+@[^\s@<>()[\]\\,;:".]+(?:\.[^\s@<>()[\]\\,;:".]+)+$/;
export function messagesDir(): string {
return path.join(process.cwd(), 'content', 'messages');
}
export type ValidationResult =
| { ok: true; name: string; email: string; message: string }
| { ok: false; reason: 'invalid' }
/** Looks like a bot. The route answers as if it had worked, so the bot learns nothing. */
| { ok: false; reason: 'spam' };
export function validateContact(input: ContactInput, now = Date.now()): ValidationResult {
if (typeof input.website === 'string' && input.website.trim()) {
return { ok: false, reason: 'spam' };
}
const started = Number(input.startedAt);
if (!Number.isFinite(started) || now - started < MIN_FILL_MS || now - started > MAX_FILL_MS) {
return { ok: false, reason: 'spam' };
}
const text = (value: unknown) => (typeof value === 'string' ? value.trim() : '');
const name = text(input.name);
const email = text(input.email);
const message = text(input.message);
if (
!name ||
name.length > LIMITS.name ||
// Length first: the pattern never sees more than the limit.
email.length > LIMITS.email ||
!EMAIL_RE.test(email) ||
!message ||
message.length > LIMITS.message
) {
return { ok: false, reason: 'invalid' };
}
// A name is one line. Keeping newlines out also keeps them out of the
// notification text and the reply subject.
return { ok: true, name: name.replace(/\s+/g, ' '), email, message };
}
function isMessage(value: unknown): value is ContactMessage {
const m = value as ContactMessage;
return (
!!m &&
typeof m.id === 'string' &&
ID_RE.test(m.id) &&
typeof m.receivedAt === 'string' &&
typeof m.name === 'string' &&
typeof m.email === 'string' &&
typeof m.message === 'string'
);
}
async function writeMessage(msg: ContactMessage): Promise<void> {
await fs.mkdir(messagesDir(), { recursive: true });
const target = path.join(messagesDir(), `${msg.id}.json`);
const tmp = `${target}.${process.pid}.tmp`;
await fs.writeFile(tmp, JSON.stringify(msg, null, 2), { mode: 0o600 });
await fs.rename(tmp, target);
}
/**
* Every stored message, newest first, after deleting the ones past their
* retention. Unreadable files are skipped rather than failing the inbox.
*/
export async function listMessages(
retentionDays: number,
now = Date.now(),
): Promise<ContactMessage[]> {
let names: string[];
try {
names = await fs.readdir(messagesDir());
} catch {
return [];
}
const cutoff = now - retentionDays * 24 * 60 * 60 * 1000;
const messages: ContactMessage[] = [];
for (const name of names) {
const id = name.replace(/\.json$/, '');
if (!ID_RE.test(id) || !name.endsWith('.json')) continue;
const file = path.join(messagesDir(), name);
if (Number(id.slice(0, 13)) < cutoff) {
await fs.rm(file, { force: true });
continue;
}
try {
const parsed = JSON.parse(await fs.readFile(file, 'utf8'));
if (isMessage(parsed)) messages.push({ ...parsed, read: parsed.read === true });
} catch {
// A half-written or hand-edited file is not worth failing the inbox for.
}
}
return messages.sort((a, b) => b.id.localeCompare(a.id));
}
export async function saveMessage(
fields: { name: string; email: string; message: string },
retentionDays: number,
now = Date.now(),
): Promise<ContactMessage | 'full'> {
const existing = await listMessages(retentionDays, now);
if (existing.length >= MAX_MESSAGES) return 'full';
const msg: ContactMessage = {
id: `${now}-${crypto.randomBytes(4).toString('hex')}`,
receivedAt: new Date(now).toISOString(),
...fields,
read: false,
};
await writeMessage(msg);
return msg;
}
/** Ids come from the admin client; the pattern keeps them inside the directory. */
export function isMessageId(id: unknown): id is string {
return typeof id === 'string' && ID_RE.test(id);
}
export async function setRead(id: string, read: boolean): Promise<boolean> {
if (!isMessageId(id)) return false;
const file = path.join(messagesDir(), `${id}.json`);
try {
const parsed = JSON.parse(await fs.readFile(file, 'utf8'));
if (!isMessage(parsed)) return false;
await writeMessage({ ...parsed, read });
return true;
} catch {
return false;
}
}
export async function deleteMessage(id: string): Promise<boolean> {
if (!isMessageId(id)) return false;
try {
await fs.rm(path.join(messagesDir(), `${id}.json`));
return true;
} catch {
return false;
}
}
/**
* Tell the owner a message arrived. Best effort: the message is already
* stored, so a failing push service must not fail the visitor's submission.
*
* The body is plain text, which is what ntfy expects; its `Title` and `Click`
* headers are ignored by endpoints that do not know them.
*/
export async function notifyNewMessage(
notifyUrl: string | undefined,
inboxUrl: string | null,
): Promise<void> {
if (!notifyUrl) return;
try {
const headers: Record<string, string> = {
'Content-Type': 'text/plain; charset=utf-8',
Title: 'New contact form message',
Tags: 'envelope',
};
if (inboxUrl) headers.Click = inboxUrl;
const res = await fetch(notifyUrl, {
method: 'POST',
headers,
body: 'A new message arrived through the contact form.',
signal: AbortSignal.timeout(5000),
});
if (!res.ok) console.warn(`[Folio] contact: notification answered ${res.status}`);
} catch (err) {
console.warn(`[Folio] contact: notification failed: ${(err as Error).message}`);
}
}