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>
173 lines
5.9 KiB
TypeScript
173 lines
5.9 KiB
TypeScript
/**
|
|
* Server-side URL helpers for generating public-facing asset URLs.
|
|
* These use encoded tokens instead of raw Immich UUIDs.
|
|
*/
|
|
|
|
import { encodeAssetId } from './tokens';
|
|
import { env } from './env';
|
|
import { cdnBase } from './cdn';
|
|
import { thumbHashToBlurDataUrl, thumbHashToDominantHex } from './thumbhash';
|
|
import type { ImmichAsset } from './immich';
|
|
|
|
/**
|
|
* Optional cache-buster, appended to every image and video URL.
|
|
*
|
|
* These responses are served `immutable` for a year, so the browser never
|
|
* revalidates and the ETag is never consulted — the URL is the only thing that
|
|
* can invalidate a browser cache. Setting IMAGE_CACHE_VERSION changes all of
|
|
* them at once, which is what you want after Immich regenerates thumbnails or a
|
|
* photo is rotated: the asset ID does not change, so nothing else would.
|
|
*
|
|
* Empty by default — the returned URLs are then byte-identical to before.
|
|
*/
|
|
const cacheBuster = env.IMAGE_CACHE_VERSION ? `&v=${env.IMAGE_CACHE_VERSION}` : '';
|
|
|
|
/**
|
|
* Generate a public image proxy URL for an asset. Absolute, on the CDN, when
|
|
* CDN mode is on (lib/cdn.ts); relative otherwise.
|
|
*/
|
|
export function imageUrl(
|
|
assetId: string,
|
|
size: 'thumbnail' | 'preview' | 'original' = 'preview',
|
|
): string {
|
|
return `${cdnBase()}/api/image/${encodeAssetId(assetId)}?size=${size}${cacheBuster}`;
|
|
}
|
|
|
|
/**
|
|
* Generate a public EXIF API URL for an asset.
|
|
*/
|
|
export function exifUrl(assetId: string): string {
|
|
return `/api/exif/${encodeAssetId(assetId)}`;
|
|
}
|
|
|
|
/**
|
|
* Generate a public video proxy URL for an asset — on the CDN in CDN mode,
|
|
* like imageUrl().
|
|
*/
|
|
export function videoUrl(assetId: string): string {
|
|
// No `size` here, so the buster is the only query parameter.
|
|
const v = cacheBuster ? `?${cacheBuster.slice(1)}` : '';
|
|
return `${cdnBase()}/api/video/${encodeAssetId(assetId)}${v}`;
|
|
}
|
|
|
|
/**
|
|
* Placeholder data derived from an asset's ThumbHash.
|
|
*/
|
|
export interface PlaceholderData {
|
|
blurDataURL: string;
|
|
dominantColor: string;
|
|
}
|
|
|
|
/**
|
|
* Generate blur placeholder and dominant color from an asset's ThumbHash.
|
|
* Returns null if the asset has no ThumbHash.
|
|
*/
|
|
export function assetPlaceholder(asset: Pick<ImmichAsset, 'thumbhash'>): PlaceholderData | null {
|
|
if (!asset.thumbhash) return null;
|
|
try {
|
|
return {
|
|
blurDataURL: thumbHashToBlurDataUrl(asset.thumbhash),
|
|
dominantColor: thumbHashToDominantHex(asset.thumbhash),
|
|
};
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Compact EXIF summary for hover overlays.
|
|
*/
|
|
export interface ExifSummary {
|
|
camera?: string;
|
|
lens?: string;
|
|
focalLength?: string;
|
|
}
|
|
|
|
/**
|
|
* Extract a compact EXIF summary from an asset's exifInfo.
|
|
* Returns undefined if no relevant EXIF data is available.
|
|
*/
|
|
export function assetExifSummary(asset: Pick<ImmichAsset, 'exifInfo'>): ExifSummary | undefined {
|
|
const exif = asset.exifInfo;
|
|
if (!exif) return undefined;
|
|
|
|
const camera = exif.model || undefined;
|
|
const lens = exif.lensModel || undefined;
|
|
const focalLength = exif.focalLength ? `${exif.focalLength}mm` : undefined;
|
|
|
|
if (!camera && !lens && !focalLength) return undefined;
|
|
return { camera, lens, focalLength };
|
|
}
|
|
|
|
/**
|
|
* The download URL for an original file (#475).
|
|
*
|
|
* Carries the album as well as the asset: the route authorises the download
|
|
* against the album that offered it, and checks the asset really belongs to
|
|
* that album.
|
|
*/
|
|
export function downloadUrl(albumId: string, assetId: string): string {
|
|
return `/api/download/${encodeAssetId(albumId)}/${encodeAssetId(assetId)}`;
|
|
}
|
|
|
|
/**
|
|
* The endpoint that streams an album (or a selection of its assets) as a ZIP.
|
|
*
|
|
* Carries only the album: the route re-checks the allowlist, the `download`
|
|
* opt-in and every password gate, exactly like the single-asset download. A
|
|
* `GET` returns the whole album; a `POST` with `{ "assets": [<token>, …] }`
|
|
* returns just those assets.
|
|
*/
|
|
export function archiveUrl(albumId: string): string {
|
|
return `/api/download/${encodeAssetId(albumId)}/archive`;
|
|
}
|
|
|
|
/**
|
|
* The Immich asset description, trimmed, for use as image alt text.
|
|
*
|
|
* Gated on the `caption` EXIF group rather than served unconditionally. That
|
|
* switch exists because the description is the one field that can hold private
|
|
* notes (#506), and an alt attribute publishes it to crawlers and view-source
|
|
* exactly as a visible caption would. A site that has switched captions off has
|
|
* said it does not want that text on the page.
|
|
*
|
|
* Returns undefined when there is nothing to say, which leaves `alt=""` — the
|
|
* correct markup for a decorative image, and better than inventing filler.
|
|
*/
|
|
export function assetCaption(
|
|
asset: Pick<ImmichAsset, 'exifInfo'>,
|
|
showCaption: boolean,
|
|
): string | undefined {
|
|
if (!showCaption) return undefined;
|
|
return asset.exifInfo?.description?.trim() || undefined;
|
|
}
|
|
|
|
/**
|
|
* EXIF orientations that rotate the frame a quarter turn.
|
|
*
|
|
* Most cameras expose the sensor in landscape whatever way the body is held,
|
|
* and record the rotation as a flag rather than rewriting the pixels. So a
|
|
* portrait frame arrives as 7008x4672 with orientation 6, and the browser turns
|
|
* it upright on display. Taking the stored dimensions at face value would call
|
|
* that photo landscape.
|
|
*
|
|
* 1-4 are upright or mirrored in place and leave the ratio alone; 5-8 all carry
|
|
* a 90 degree turn, so width and height swap.
|
|
*/
|
|
const ROTATED_ORIENTATIONS = new Set([5, 6, 7, 8]);
|
|
|
|
/**
|
|
* Compute the natural aspect ratio (width / height) from EXIF dimensions,
|
|
* as the image is displayed rather than as it is stored.
|
|
* Returns undefined if dimensions are not available.
|
|
*/
|
|
export function assetAspectRatio(asset: Pick<ImmichAsset, 'exifInfo'>): number | undefined {
|
|
const w = asset.exifInfo?.exifImageWidth;
|
|
const h = asset.exifInfo?.exifImageHeight;
|
|
if (!w || !h || h <= 0) return undefined;
|
|
|
|
// Immich reports the flag as a string; anything unparseable is left upright.
|
|
const orientation = Number(asset.exifInfo?.orientation);
|
|
return ROTATED_ORIENTATIONS.has(orientation) ? h / w : w / h;
|
|
}
|