From 7483127795817f4c1374a2062aa7e55d99f2463a Mon Sep 17 00:00:00 2001 From: Khafra <42794878+KhafraDev@users.noreply.github.com> Date: Fri, 25 Nov 2022 11:00:02 -0500 Subject: [PATCH 1/4] fix(fetch): set content-length header for FormData body --- lib/fetch/body.js | 32 +++++++++++++++++++++++++++++++- test/fetch/content-length.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 test/fetch/content-length.js diff --git a/lib/fetch/body.js b/lib/fetch/body.js index cf89c7d59f6..50a2846dc58 100644 --- a/lib/fetch/body.js +++ b/lib/fetch/body.js @@ -141,7 +141,37 @@ function extractBody (object, keepalive = false) { source = object // Set length to unclear, see html/6424 for improving this. - // TODO + length = (() => { + const prefixLength = prefix.length + const boundaryLength = boundary.length + let bodyLength = 0 + + for (const [name, value] of object) { + if (typeof value === 'string') { + bodyLength += + prefixLength + + Buffer.byteLength(`; name="${escape(normalizeLinefeeds(name))}"`) + + Buffer.byteLength(`\r\n\r\n${normalizeLinefeeds(value)}\r\n`) + } else { + bodyLength += + prefixLength + + Buffer.byteLength(`; name="${escape(normalizeLinefeeds(name))}"`) + + (value.name ? Buffer.byteLength(`; filename="${escape(value.name)}"`) : 0) + + 2 + // \r\n + `Content-Type: ${ + value.type || 'application/octet-stream' + }\r\n\r\n`.length + + // value is a Blob or File + bodyLength += value.size + + bodyLength += 2 // \r\n + } + } + + bodyLength += boundaryLength + 4 // --boundary-- + return bodyLength + })() // Set type to `multipart/form-data; boundary=`, // followed by the multipart/form-data boundary string generated diff --git a/test/fetch/content-length.js b/test/fetch/content-length.js new file mode 100644 index 00000000000..e69125a24c6 --- /dev/null +++ b/test/fetch/content-length.js @@ -0,0 +1,29 @@ +'use strict' + +const { test } = require('tap') +const { Blob } = require('buffer') +const { FormData, fetch } = require('../..') +const { once } = require('events') +const { createServer } = require('http') + +// https://github.com/nodejs/undici/issues/1783 +test('Sending a FormData body sets Content-Length header', async (t) => { + const server = createServer((req, res) => { + t.equal(req.headers['content-length'], '285') + res.end() + }).listen(0) + + await once(server, 'listening') + t.teardown(server.close.bind(server)) + + const blob = new Blob(['body'], { type: 'text/plain' }) + + const fd = new FormData() + fd.append('file', blob) + fd.append('string', 'string value') + + await fetch(`http://localhost:${server.address().port}`, { + method: 'POST', + body: fd + }) +}) From 3a16592ceb881915d20e8d16937ab879f96e74ce Mon Sep 17 00:00:00 2001 From: Khafra <42794878+KhafraDev@users.noreply.github.com> Date: Fri, 25 Nov 2022 11:16:03 -0500 Subject: [PATCH 2/4] fix: skip test on v16 --- test/fetch/content-length.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/fetch/content-length.js b/test/fetch/content-length.js index e69125a24c6..80da0b31938 100644 --- a/test/fetch/content-length.js +++ b/test/fetch/content-length.js @@ -6,8 +6,10 @@ const { FormData, fetch } = require('../..') const { once } = require('events') const { createServer } = require('http') +const isV16x = process.version.startsWith('v16.') + // https://github.com/nodejs/undici/issues/1783 -test('Sending a FormData body sets Content-Length header', async (t) => { +test('Sending a FormData body sets Content-Length header', { skip: isV16x }, async (t) => { const server = createServer((req, res) => { t.equal(req.headers['content-length'], '285') res.end() From a215964b40da129c611c322ce26f93de3676b116 Mon Sep 17 00:00:00 2001 From: Khafra <42794878+KhafraDev@users.noreply.github.com> Date: Fri, 25 Nov 2022 16:29:59 -0500 Subject: [PATCH 3/4] fix: remove test --- test/fetch/content-length.js | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 test/fetch/content-length.js diff --git a/test/fetch/content-length.js b/test/fetch/content-length.js deleted file mode 100644 index 80da0b31938..00000000000 --- a/test/fetch/content-length.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict' - -const { test } = require('tap') -const { Blob } = require('buffer') -const { FormData, fetch } = require('../..') -const { once } = require('events') -const { createServer } = require('http') - -const isV16x = process.version.startsWith('v16.') - -// https://github.com/nodejs/undici/issues/1783 -test('Sending a FormData body sets Content-Length header', { skip: isV16x }, async (t) => { - const server = createServer((req, res) => { - t.equal(req.headers['content-length'], '285') - res.end() - }).listen(0) - - await once(server, 'listening') - t.teardown(server.close.bind(server)) - - const blob = new Blob(['body'], { type: 'text/plain' }) - - const fd = new FormData() - fd.append('file', blob) - fd.append('string', 'string value') - - await fetch(`http://localhost:${server.address().port}`, { - method: 'POST', - body: fd - }) -}) From 7fb6a129abc5a10677026f8142d612b0ccdfb023 Mon Sep 17 00:00:00 2001 From: Khafra <42794878+KhafraDev@users.noreply.github.com> Date: Sat, 26 Nov 2022 14:07:52 -0500 Subject: [PATCH 4/4] test: add test back --- test/fetch/content-length.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 test/fetch/content-length.js diff --git a/test/fetch/content-length.js b/test/fetch/content-length.js new file mode 100644 index 00000000000..9264091069b --- /dev/null +++ b/test/fetch/content-length.js @@ -0,0 +1,29 @@ +'use strict' + +const { test } = require('tap') +const { createServer } = require('http') +const { once } = require('events') +const { Blob } = require('buffer') +const { fetch, FormData } = require('../..') + +// https://github.com/nodejs/undici/issues/1783 +test('Content-Length is set when using a FormData body with fetch', async (t) => { + const server = createServer((req, res) => { + // TODO: check the length's value once the boundary has a fixed length + t.ok('content-length' in req.headers) // request has content-length header + t.ok(!Number.isNaN(Number(req.headers['content-length']))) + res.end() + }).listen(0) + + await once(server, 'listening') + t.teardown(server.close.bind(server)) + + const fd = new FormData() + fd.set('file', new Blob(['hello world 👋'], { type: 'text/plain' }), 'readme.md') + fd.set('string', 'some string value') + + await fetch(`http://localhost:${server.address().port}`, { + method: 'POST', + body: fd + }) +})