From bbc23b6250dfcfae90c6ac01a606fdfeb2f826d5 Mon Sep 17 00:00:00 2001 From: Alan Grainger <16197738+alangrainger@users.noreply.github.com> Date: Mon, 5 Oct 2026 09:21:48 +1300 Subject: [PATCH] Move attachmentDisposition to filename.ts --- app/src/gallery/filename.ts | 7 +++++++ app/src/stream/asset.ts | 3 +-- app/src/stream/download.ts | 10 +--------- app/tests/contentDisposition.test.ts | 3 ++- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/src/gallery/filename.ts b/app/src/gallery/filename.ts index 78c1d41..f05df26 100644 --- a/app/src/gallery/filename.ts +++ b/app/src/gallery/filename.ts @@ -103,6 +103,13 @@ export function downloadFilename (asset: Asset): string { return getFilename(asset, resolveImageEndpoint(ImageSize.original, asset).servedSize) } +/** Download Content-Disposition, RFC 5987-encoded so `,` and `;` can't split the header. */ +export function attachmentDisposition (filename: string): string { + const encoded = encodeURIComponent(filename) + .replace(/['()*]/g, c => '%' + c.charCodeAt(0).toString(16).toUpperCase()) + return `attachment; filename*=UTF-8''${encoded}` +} + /** Content-type without its parameters, or undefined if absent. */ export function responseMime (response: globalThis.Response): string | undefined { return (response.headers.get('content-type') || '').split(';')[0].trim() || undefined diff --git a/app/src/stream/asset.ts b/app/src/stream/asset.ts index 20ac314..c03f8c8 100644 --- a/app/src/stream/asset.ts +++ b/app/src/stream/asset.ts @@ -7,12 +7,11 @@ import { import { Response } from 'express-serve-static-core' import { Asset, ImageSize, IncomingShareRequest, SharedLink } from '../types' import { respondToInvalidRequest } from '../invalidRequestHandler' -import { getFilename, servedMimeFrom } from '../gallery/filename' +import { attachmentDisposition, getFilename, servedMimeFrom } from '../gallery/filename' import { isVideoAsset, resolveDownloadEndpoint, resolveImageEndpoint } from '../gallery/sizing' import { pipeline } from 'stream/promises' import { readableFromWeb } from '../utils/webStream' import { log } from '../utils/log' -import { attachmentDisposition } from './download' /** * Stream an asset from Immich back to the client. diff --git a/app/src/stream/download.ts b/app/src/stream/download.ts index cf2709d..acc9b0a 100644 --- a/app/src/stream/download.ts +++ b/app/src/stream/download.ts @@ -6,7 +6,7 @@ import archiver, { Archiver } from 'archiver' import { sanitize } from '../utils/sanitize' import { resolveDownloadEndpoint, ImageEndpoint } from '../gallery/sizing' import { title } from '../share' -import { getFilename, responseMime, servedMimeFrom } from '../gallery/filename' +import { attachmentDisposition, getFilename, responseMime, servedMimeFrom } from '../gallery/filename' import { readableFromWeb } from '../utils/webStream' import { respondToInvalidRequest } from '../invalidRequestHandler' @@ -238,14 +238,6 @@ function enrichFromHeaders (asset: Asset, response: globalThis.Response): Asset } } -export function attachmentDisposition (filename: string): string { - // encodeURI leaves `,` and `;` raw, which split the header: Chrome reads a - // comma as a second Content-Disposition and refuses the download. - const encoded = encodeURIComponent(filename) - .replace(/['()*]/g, c => '%' + c.charCodeAt(0).toString(16).toUpperCase()) - return `attachment; filename*=UTF-8''${encoded}` -} - /** * Extract a filename from a `Content-Disposition` header. Prefers the RFC 5987 * `filename*=UTF-8''...` form (percent-decoded) over the plain `filename=`. diff --git a/app/tests/contentDisposition.test.ts b/app/tests/contentDisposition.test.ts index 78b9547..bf58e83 100644 --- a/app/tests/contentDisposition.test.ts +++ b/app/tests/contentDisposition.test.ts @@ -1,5 +1,6 @@ import { describe, it, expect } from 'vitest' -import { attachmentDisposition, filenameFromContentDisposition } from '../src/stream/download' +import { filenameFromContentDisposition } from '../src/stream/download' +import { attachmentDisposition } from '../src/gallery/filename' // Used by the zip download path to recover the real filename for album grid // assets (which arrive without originalFileName) from the /original response.