Skip to content
Open
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
28 changes: 18 additions & 10 deletions lib/web/cookies/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,27 @@ function stringify (cookie) {
}

for (const part of cookie.unparsed) {
if (!part.includes('=')) {
throw new Error('Invalid unparsed')
}

const [key, ...value] = part.split('=')
if (part.includes('=')) {
const [key, ...value] = part.split('=')

const trimmedKey = key.trim()
const joinedValue = value.join('=')
const trimmedKey = key.trim()
Comment on lines 326 to +330

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added check for empty trimmed attribute names and added negative test cases in cf530aa.

if (trimmedKey.length === 0) {
throw new Error('Invalid unparsed')
}
const joinedValue = value.join('=')

validateCookieName(trimmedKey)
validateCookieValue(joinedValue)
validateCookieName(trimmedKey)
validateCookieValue(joinedValue)

out.push(`${trimmedKey}=${joinedValue}`)
out.push(`${trimmedKey}=${joinedValue}`)
} else {
const trimmedKey = part.trim()
if (trimmedKey.length === 0) {
throw new Error('Invalid unparsed')
}
validateCookieName(trimmedKey)
out.push(trimmedKey)
}
}

return out.join('; ')
Expand Down
24 changes: 24 additions & 0 deletions test/cookie/cookies.js
Original file line number Diff line number Diff line change
Expand Up @@ -782,3 +782,27 @@ test('Set-Cookie parser ignores an unparseable Expires', () => {
value: 'a3fWa'
}])
})

test('Cookie setCookie supports valueless unparsed attributes (e.g. Partitioned)', () => {
const headers = new Headers()
setCookie(headers, {
name: 'session',
value: 'abc',
secure: true,
path: '/',
unparsed: ['Partitioned']
})
assert.equal(headers.get('Set-Cookie'), 'session=abc; Secure; Path=/; Partitioned')

assert.throws(() => {
setCookie(headers, { name: 'session', value: 'abc', unparsed: [''] })
}, /Invalid unparsed/)

assert.throws(() => {
setCookie(headers, { name: 'session', value: 'abc', unparsed: [' '] })
}, /Invalid unparsed/)

assert.throws(() => {
setCookie(headers, { name: 'session', value: 'abc', unparsed: ['=val'] })
}, /Invalid unparsed/)
})