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.

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(Headers): filter out forbidden headers & get should return null on unknown header name #1337

Merged
merged 2 commits into from Apr 13, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/fetch/response.js
Expand Up @@ -393,7 +393,8 @@ function makeFilteredHeadersList (headersList, filter) {
get (target, prop) {
// Override methods used by Headers class.
if (prop === 'get' || prop === 'has') {
return (name) => filter(name) ? target[prop](name) : undefined
const defaultReturn = prop === 'has' ? false : null
return (name) => filter(name) ? target[prop](name) : defaultReturn
} else if (prop === Symbol.iterator) {
return function * () {
for (const entry of target) {
Expand All @@ -420,7 +421,10 @@ function filterResponse (response, type) {

return makeFilteredResponse(response, {
type: 'basic',
headersList: makeFilteredHeadersList(response.headersList, (name) => !forbiddenResponseHeaderNames.includes(name))
headersList: makeFilteredHeadersList(
response.headersList,
(name) => !forbiddenResponseHeaderNames.includes(name.toLowerCase())
)
})
} else if (type === 'cors') {
// A CORS filtered response is a filtered response whose type is "cors"
Expand Down
36 changes: 36 additions & 0 deletions test/fetch/headers.js
Expand Up @@ -12,6 +12,8 @@ const {
forbiddenHeaderNames,
forbiddenResponseHeaderNames
} = require('../../lib/fetch/constants')
const { createServer } = require('http')
const { fetch } = require('../../index')

tap.test('Headers initialization', t => {
t.plan(7)
Expand Down Expand Up @@ -627,3 +629,37 @@ tap.test('response guard', (t) => {

t.end()
})

tap.test('set-cookie[2] in Headers constructor', (t) => {
const headers = new Headers(forbiddenResponseHeaderNames.map(k => [k, 'v']))

for (const header of forbiddenResponseHeaderNames) {
t.ok(headers.has(header))
t.equal(headers.get(header), 'v')
}

t.end()
})

// https://github.com/nodejs/undici/issues/1328
tap.test('set-cookie[2] received from server - issue #1328', (t) => {
const server = createServer((req, res) => {
res.setHeader('set-cookie', 'my-cookie; wow')
res.end('Goodbye!')
}).unref()
t.teardown(server.close.bind(server))

server.listen(0, async () => {
const { headers } = await fetch(`http://localhost:${server.address().port}`)

t.notOk(headers.has('set-cookie'))
t.notOk(headers.has('Set-cookie'))
t.notOk(headers.has('sEt-CoOkIe'))

t.equal(headers.get('set-cookie'), null)
t.equal(headers.get('Set-cookie'), null)
t.equal(headers.get('sEt-CoOkIe'), null)

t.end()
})
})