diff --git a/package.json b/package.json index 1c8c3d2d..a8fa88ac 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "digest-header": "^1.0.0", "form-data-encoder": "^1.7.2", "formdata-node": "^4.3.3", - "formstream": "^1.1.1", + "formstream": "^1.5.3", "mime-types": "^2.1.35", "pump": "^3.0.0", "qs": "^6.11.2", diff --git a/test/multipart-escaping.test.ts b/test/multipart-escaping.test.ts new file mode 100644 index 00000000..e4cb63f8 --- /dev/null +++ b/test/multipart-escaping.test.ts @@ -0,0 +1,60 @@ +import { strict as assert } from 'node:assert'; +import { Readable } from 'node:stream'; +import { describe, it, beforeAll, afterAll, vi } from 'vitest'; +import { startServer } from './fixtures/server'; + +describe.each([ 'Undici', 'Node 14 fallback' ])('multipart escaping with %s', encoder => { + let request: typeof import('../src').request; + let close: () => Promise; + let url: string; + + beforeAll(async () => { + vi.resetModules(); + if (encoder === 'Node 14 fallback') { + vi.doMock('undici', async () => ({ + ...await vi.importActual('undici'), + FormData: undefined, + })); + } + ({ request } = await import('../src')); + const server = await startServer(); + close = server.closeServer; + url = `${server.url}raw`; + }); + + afterAll(async () => { + vi.doUnmock('undici'); + vi.resetModules(); + await close(); + }); + + it.each([ 'buffer', 'readable', 'stream path' ])('escapes filenames from %s', async source => { + const filename = 'evil.txt"\r\nX-Injected: smuggled\r\nContent-Disposition: form-data; name="ghost'; + const escaped = 'evil.txt%22%0D%0AX-Injected: smuggled%0D%0AContent-Disposition: form-data; name=%22ghost'; + const value = source === 'buffer' ? Buffer.from('data') : Readable.from([ Buffer.from('data') ]); + const files = source === 'stream path' ? Object.assign(value, { path: filename }) : { [filename]: value }; + const response = await request(url, { files, dataType: 'text' }); + const field = source === 'stream path' ? 'file' : escaped; + assert.equal(response.status, 200); + assert.ok(response.data.includes(`Content-Disposition: form-data; name="${field}"; filename="${escaped}"\r\n`)); + assert.doesNotMatch(response.data, /\r\nX-Injected:/); + assert.equal(response.data.match(/\r\nContent-Disposition:/g)?.length, 1); + }); + + it('escapes normal field names without changing their values', async () => { + const response = await request(url, { + files: Buffer.from('data'), + data: { 'field"\r\nX-Injected: value': 'unchanged\r\nvalue' }, + dataType: 'text', + }); + assert.ok(response.data.includes('name="field%22%0D%0AX-Injected: value"\r\n')); + assert.ok(response.data.includes('\r\n\r\nunchanged\r\nvalue\r\n')); + assert.doesNotMatch(response.data, /\r\nX-Injected:/); + }); + + it('preserves Unicode filenames without adding filename*', async () => { + const response = await request(url, { files: { '中文.txt': Buffer.from('data') }, dataType: 'text' }); + assert.ok(response.data.includes('filename="中文.txt"\r\n')); + assert.doesNotMatch(response.data, /filename\*/); + }); +}); diff --git a/test/options.stream.test.ts b/test/options.stream.test.ts index 17a5f681..aef2b158 100644 --- a/test/options.stream.test.ts +++ b/test/options.stream.test.ts @@ -94,7 +94,7 @@ describe('options.stream.test.ts', () => { assert.equal(response.headers['content-type'], 'application/json'); assert.equal(response.data.method, 'POST'); // console.log(response.data); - assert.match(response.data.headers['content-type'], /^multipart\/form-data; boundary=--------------------------\d+$/); + assert.match(response.data.headers['content-type'], /^multipart\/form-data; boundary=--------------------------[a-f0-9]{24}$/); assert.equal(response.data.files.file.filename, 'options.stream.test.ts'); assert.equal(response.data.form.hello, '你好 urllib 3'); const raw = await readFile(__filename);