Percent-encode commas in download filenames

encodeURI leaves , ; and other reserved characters raw in the RFC 5987
filename* value. A comma in an album title ("Yellow Aster Butte, WA")
makes Chrome see two Content-Disposition headers and fail the download
with ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION. Single-asset
downloads had the same bug for original filenames with a comma.

Both call sites now share attachmentDisposition(), which uses
encodeURIComponent plus the attr-char exclusions ' ( ) *.
This commit is contained in:
Adrian Lam
2026-10-03 01:53:48 -04:00
parent aa520b47fc
commit 930d990580
3 changed files with 28 additions and 6 deletions
+17 -1
View File
@@ -1,5 +1,5 @@
import { describe, it, expect } from 'vitest'
import { filenameFromContentDisposition } from '../src/stream/download'
import { attachmentDisposition, filenameFromContentDisposition } from '../src/stream/download'
// Used by the zip download path to recover the real filename for album grid
// assets (which arrive without originalFileName) from the /original response.
@@ -23,3 +23,19 @@ describe('filenameFromContentDisposition', () => {
expect(filenameFromContentDisposition(null)).toBeUndefined()
})
})
describe('attachmentDisposition', () => {
it('percent-encodes commas and semicolons so the header stays a single value', () => {
const header = attachmentDisposition('Yellow Aster Butte, WA; day 1.zip')
expect(header).toBe("attachment; filename*=UTF-8''Yellow%20Aster%20Butte%2C%20WA%3B%20day%201.zip")
})
it('percent-encodes the characters RFC 5987 excludes from attr-char', () => {
expect(attachmentDisposition("it's (1)*.jpg")).toBe("attachment; filename*=UTF-8''it%27s%20%281%29%2A.jpg")
})
it('round-trips through filenameFromContentDisposition', () => {
const name = "Photo été, #2 & 'friends' (100%).jpg"
expect(filenameFromContentDisposition(attachmentDisposition(name))).toBe(name)
})
})