Skip to content

fix: handle flat alternating header arrays in cache normalizeHeaders #5536

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.

Sign up for GitHub

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

Merged
mcollina merged 3 commits into from
Jul 11, 2026
Merged

fix: handle flat alternating header arrays in cache normalizeHeaders #5536

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f8dcb7
fix: handle flat alternating header arrays in cache normalizeHeaders
mcollina Jul 9, 2026
db1be8f
test: add normalizeHeaders tests for flat alternating header arrays
mcollina Jul 9, 2026
c16c29d
refactor: replace .map() with for loop in normalizeHeaders
mcollina Jul 9, 2026
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
51 changes: 44 additions & 7 deletions lib/util/cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,52 @@ function normalizeHeaders (opts) {
headers = {}

if (hasSafeIterator(opts.headers)) {
for (const x of opts.headers) {
if (!Array.isArray(x)) {
throw new Error('opts.headers is not a valid header map')
if (Array.isArray(opts.headers)) {
// Array format: could be flat alternating [k, v, k, v, ...]
// or array-of-pairs [[k, v], ...]
const first = opts.headers[0]
if (Array.isArray(first)) {
for (const x of opts.headers) {
if (!Array.isArray(x)) {
throw new Error('opts.headers is not a valid header map')
}
const [key, val] = x
if (typeof key !== 'string' || typeof val !== 'string') {
throw new Error('opts.headers is not a valid header map')
}
headers[key.toLowerCase()] = val
}
} else {
// Flat alternating array [k, v, k, v, ...]
const len = opts.headers.length
if (len % 2 !== 0) {
throw new Error('opts.headers is not a valid header map')
}
for (let i = 0; i < len; i += 2) {
const key = opts.headers[i]
const val = opts.headers[i + 1]
if (typeof key !== 'string' || (typeof val !== 'string' && !Array.isArray(val))) {
throw new Error('opts.headers is not a valid header map')
}
if (typeof val === 'string') {
headers[key.toLowerCase()] = val
} else {
headers[key.toLowerCase()] = val.map(v => typeof v === 'string' ? v : v.toString('latin1'))
}
}
}
const [key, val] = x
if (typeof key !== 'string' || typeof val !== 'string') {
throw new Error('opts.headers is not a valid header map')
} else {
// Non-array iterable (e.g. Map) — use original iteration logic
for (const x of opts.headers) {
if (!Array.isArray(x)) {
throw new Error('opts.headers is not a valid header map')
}
const [key, val] = x
if (typeof key !== 'string' || typeof val !== 'string') {
throw new Error('opts.headers is not a valid header map')
}
headers[key.toLowerCase()] = val
}
headers[key.toLowerCase()] = val
}
} else {
for (const key of Object.keys(opts.headers)) {
Expand Down
Loading