Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions packages/core/src/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ describe('generateContentDisposition', () => {
expect(generateContentDisposition('!@#$%^%^&*()\'".txt')).toEqual('inline; filename="!@#$%^%^&*()\'\\".txt"; filename*=utf-8\'\'!%40%23%24%25^%25^%26%2A%28%29%27%22.txt')
})

it('escape \\ special char', () => {
expect(generateContentDisposition('a\\b.txt')).toEqual('inline; filename="a\\\\b.txt"; filename*=utf-8\'\'a%5Cb.txt')
// a trailing backslash must not escape the closing quote
expect(generateContentDisposition('a\\')).toEqual('inline; filename="a\\\\"; filename*=utf-8\'\'a%5C')
expect(generateContentDisposition('a\\"; injected=x')).toEqual('inline; filename="a\\\\\\"; injected=x"; filename*=utf-8\'\'a%5C%22%3B%20injected%3Dx')
})

it('escape non-ASCII filenames', () => {
expect(generateContentDisposition('テンプレ\'"ート.txt')).toEqual('inline; filename="____\'\\"__.txt"; filename*=utf-8\'\'%E3%83%86%E3%83%B3%E3%83%97%E3%83%AC%27%22%E3%83%BC%E3%83%88.txt')
})
Expand All @@ -30,6 +37,8 @@ it('getFilenameFromContentDisposition', () => {
expect(getFilenameFromContentDisposition('attachment; filename=""')).toEqual('')
expect(getFilenameFromContentDisposition('attachment; filename="test.txt"')).toEqual('test.txt')
expect(getFilenameFromContentDisposition('attachment; filename="!@#$%^%^&*()\'\\".txt"')).toEqual('!@#$%^%^&*()\'".txt')
expect(getFilenameFromContentDisposition('attachment; filename="a\\\\b.txt"')).toEqual('a\\b.txt')
expect(getFilenameFromContentDisposition('attachment; filename="a\\\\"')).toEqual('a\\')

expect(getFilenameFromContentDisposition('attachment; filename*=utf-8\'\'')).toEqual('')
expect(getFilenameFromContentDisposition('attachment; filename*=utf-8\'\'test.txt')).toEqual('test.txt')
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { StandardHeaders, StandardUrl } from './types'
import { toArray, tryDecodeURIComponent } from '@standardserver/shared'

export function generateContentDisposition(filename: string): string {
const encodedFilename = filename.replace(/[^\x20-\x7E]/g, '_').replace(/"/g, '\\"')
const encodedFilename = filename.replace(/[^\x20-\x7E]/g, '_').replace(/[\\"]/g, '\\$&')

// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent#encoding_for_content-disposition_and_link_headers
const encodedFilenameStar = encodeURIComponent(filename)
Expand All @@ -19,9 +19,9 @@ export function getFilenameFromContentDisposition(contentDisposition: string): s
return tryDecodeURIComponent(encodedFilenameStarMatch[2])
}

const encodedFilenameMatch = contentDisposition.match(/filename="((?:\\"|[^"])*)"/i)
const encodedFilenameMatch = contentDisposition.match(/filename="((?:\\.|[^"\\])*)"/i)
if (encodedFilenameMatch && typeof encodedFilenameMatch[1] === 'string') {
return encodedFilenameMatch[1].replace(/\\"/g, '"')
return encodedFilenameMatch[1].replace(/\\(.)/g, '$1')
}
}

Expand Down
Loading