Skip to content

Commit

Permalink
fix(ClientRequest): prevent duplicates when recording set headers (#639)
Browse files Browse the repository at this point in the history
  • Loading branch information
kettanaito committed Sep 15, 2024
1 parent bb9d798 commit 8b75fd7
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 9 deletions.
24 changes: 24 additions & 0 deletions src/interceptors/ClientRequest/utils/recordRawHeaders.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,27 @@ it('stops recording once the patches are restored', () => {
// Must return the normalized headers (no access to raw headers).
expect(getRawFetchHeaders(headers)).toEqual([['x-my-header', '1']])
})

it('overrides an existing header when calling ".set()"', () => {
recordRawFetchHeaders()
const headers = new Headers([['a', '1']])
expect(headers.get('a')).toBe('1')

headers.set('a', '2')
expect(headers.get('a')).toBe('2')

const headersClone = new Headers(headers)
expect(headersClone.get('a')).toBe('2')
})

it('overrides an existing multi-value header when calling ".set()"', () => {
recordRawFetchHeaders()
const headers = new Headers([
['a', '1'],
['a', '2'],
])
expect(headers.get('a')).toBe('1, 2')

headers.set('a', '3')
expect(headers.get('a')).toBe('3')
})
42 changes: 33 additions & 9 deletions src/interceptors/ClientRequest/utils/recordRawHeaders.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
type HeaderTuple = [string, string]
type RawHeaders = Array<HeaderTuple>
type SetHeaderBehavior = 'set' | 'append'

const kRawHeaders = Symbol('kRawHeaders')
const kRestorePatches = Symbol('kRestorePatches')

function recordRawHeader(headers: Headers, args: HeaderTuple) {
defineRawHeaders(headers, [])
function recordRawHeader(
headers: Headers,
args: HeaderTuple,
behavior: SetHeaderBehavior
) {
ensureRawHeadersSymbol(headers, [])
const rawHeaders = Reflect.get(headers, kRawHeaders) as RawHeaders

if (behavior === 'set') {
// When recording a set header, ensure we remove any matching existing headers.
for (let index = rawHeaders.length - 1; index >= 0; index--) {
if (rawHeaders[index][0].toLowerCase() === args[0].toLowerCase()) {
rawHeaders.splice(index, 1)
}
}
}

rawHeaders.push(args)
}

function defineRawHeaders(headers: Headers, rawHeaders: RawHeaders): void {
function ensureRawHeadersSymbol(
headers: Headers,
rawHeaders: RawHeaders
): void {
if (Reflect.has(headers, kRawHeaders)) {
return
}
Expand Down Expand Up @@ -84,7 +102,7 @@ export function recordRawFetchHeaders() {
[Reflect.get(headersInit, kRawHeaders)],
newTarget
)
defineRawHeaders(headers, Reflect.get(headersInit, kRawHeaders))
ensureRawHeadersSymbol(headers, Reflect.get(headersInit, kRawHeaders))
return headers
}

Expand All @@ -98,7 +116,7 @@ export function recordRawFetchHeaders() {
const rawHeadersInit = Array.isArray(headersInit)
? headersInit
: Object.entries(headersInit)
defineRawHeaders(headers, rawHeadersInit)
ensureRawHeadersSymbol(headers, rawHeadersInit)
}

return headers
Expand All @@ -108,14 +126,14 @@ export function recordRawFetchHeaders() {

Headers.prototype.set = new Proxy(Headers.prototype.set, {
apply(target, thisArg, args: HeaderTuple) {
recordRawHeader(thisArg, args)
recordRawHeader(thisArg, args, 'set')
return Reflect.apply(target, thisArg, args)
},
})

Headers.prototype.append = new Proxy(Headers.prototype.append, {
apply(target, thisArg, args: HeaderTuple) {
recordRawHeader(thisArg, args)
recordRawHeader(thisArg, args, 'append')
return Reflect.apply(target, thisArg, args)
},
})
Expand Down Expand Up @@ -161,7 +179,10 @@ export function recordRawFetchHeaders() {
const request = Reflect.construct(target, args, newTarget)

if (typeof args[1] === 'object' && args[1].headers != null) {
defineRawHeaders(request.headers, inferRawHeaders(args[1].headers))
ensureRawHeadersSymbol(
request.headers,
inferRawHeaders(args[1].headers)
)
}

return request
Expand All @@ -186,7 +207,10 @@ export function recordRawFetchHeaders() {
const response = Reflect.construct(target, args, newTarget)

if (typeof args[1] === 'object' && args[1].headers != null) {
defineRawHeaders(response.headers, inferRawHeaders(args[1].headers))
ensureRawHeadersSymbol(
response.headers,
inferRawHeaders(args[1].headers)
)
}

return response
Expand Down

0 comments on commit 8b75fd7

Please sign in to comment.