Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: content-disposition filename regexp #87

Merged
merged 2 commits into from
Nov 13, 2024
Merged

fix: content-disposition filename regexp #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b86177
fix: content-disposition filename regexp
Nov 12, 2024
bda1d4e
Fix: Content-disposition filename matcher - improve regexp to work wi…
Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function normalizeMetadata(input?: File | Response | BufferLike | StreamL
}
if (input instanceof Response) {
const contentDisposition = input.headers.get("content-disposition")
const filename = contentDisposition && contentDisposition.match(/;\s*filename\*?=["']?(.*?)["']?$/i)
const filename = contentDisposition && contentDisposition.match(/;\s*filename\*?\s*=\s*(?:UTF-\d+''|)["']?([^;"'\r\n]*)["']?(?:;|$)/i);
const urlName = filename && filename[1] || input.url && new URL(input.url).pathname.split("/").findLast(Boolean)
const decoded = urlName && decodeURIComponent(urlName)
// @ts-ignore allow coercion from null to zero
Expand Down
10 changes: 9 additions & 1 deletion test/metadata.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@ Deno.test("normalizeMetadata needs a filename along Responses with insufficient

Deno.test("normalizeMetadata guesses filename from Content-Disposition", () => {
const metadata = normalizeMetadata(new Response("four", {
headers: { "content-disposition": "attachment; filename=test.txt" }
headers: { "content-disposition": "attachment; filename=test.txt; size=0" }
}))
assertEquals(metadata, { uncompressedSize: 0n, encodedName, nameIsBuffer: false })
})

Deno.test("normalizeMetadata guesses filename from non latin Content-Disposition", () => {
const metadata = normalizeMetadata(new Response("four", {
headers: { "content-disposition": "attachment; filename* = UTF-8''%CF%8C%CE%BD%CE%BF%CE%BC%CE%B1%20%CE%B1%CF%81%CF%87%CE%B5%CE%AF%CE%BF%CF%85.txt" }
}))
assertEquals(metadata, { uncompressedSize: 0n,encodedName: new TextEncoder().encode("όνομα αρχείου.txt"), nameIsBuffer: false })
})


Deno.test("normalizeMetadata guesses filename from a Response URL", () => {
const response = Object.create(Response.prototype, {
url: { get() { return "https://example.com/path/test.txt" } },
Expand Down