@nxtedition/nxt-undici 7.4.1 → 7.4.2

package/lib/interceptor/pressure.js

@@ -326,6 +326,17 @@ class Handler extends DecoratorHandler {
     return super.onHeaders(statusCode, headers, resume)
   }
 
+  onUpgrade(statusCode, headers, socket) {
+    // A successful upgrade (HTTP 101) is its own terminal branch — neither
+    // onComplete nor onError follows it (see the dns interceptor's Handler for
+    // the same fix). Settle as a success here, otherwise `running` stays >= 1
+    // forever: the per-origin record can never satisfy the eviction condition
+    // and the sampling timer keeps firing for the process lifetime. An upgrade
+    // is a success, not an overload error.
+    this.#settle(false)
+    super.onUpgrade(statusCode, headers, socket)
+  }
+
   onComplete(trailers) {
     this.#settle(isErrorStatus(this.#statusCode))
     super.onComplete(trailers)

package/lib/interceptor/proxy.js

@@ -2,13 +2,15 @@ import net from 'node:net'
 import createError from 'http-errors'
 import { DecoratorHandler } from '../utils.js'
 
+function noop() {}
+
 // Accumulator used by reduceHeaders on the response path. Hoisted to module
 // scope so it is allocated once rather than on every onHeaders/onUpgrade call.
 /**
- * @param {Record<string, string>} acc
+ * @param {Record<string, string | string[]>} acc
  * @param {string} key
- * @param {string} val
- * @returns {Record<string, string>}
+ * @param {string | string[]} val
+ * @returns {Record<string, string | string[]>}
  */
 const copyHeader = (acc, key, val) => {
   acc[key] = val
@@ -25,9 +27,9 @@ class Handler extends DecoratorHandler {
   }
 
   onUpgrade(statusCode, headers, socket) {
-    super.onUpgrade(
-      statusCode,
-      reduceHeaders(
+    let reduced
+    try {
+      reduced = reduceHeaders(
         {
           headers,
           httpVersion: this.#opts.httpVersion ?? this.#opts.req?.httpVersion,
@@ -39,9 +41,21 @@ class Handler extends DecoratorHandler {
         },
         copyHeader,
         {},
-      ),
-      socket,
-    )
+      )
+    } catch (err) {
+      // reduceHeaders throws on protocol errors (inbound Forwarded on a
+      // response → BadGateway, looping Via → LoopDetected). A throw must not
+      // escape onUpgrade: undici's H1 upgrade path nulls the request's queue
+      // slot before invoking onUpgrade and its catch only destroys the socket
+      // — no onError ever reaches the handler chain, leaving the caller
+      // waiting forever. Deliver the terminal error downstream ourselves
+      // (super.onError is once-guarded) and destroy the socket so it is not
+      // leaked; noop error listener since nothing downstream ever receives it.
+      socket.on('error', noop).destroy(err)
+      super.onError(err)
+      return
+    }
+    super.onUpgrade(statusCode, reduced, socket)
   }
 
   onHeaders(statusCode, headers, resume) {
@@ -148,8 +162,10 @@ function isHopByHop(key) {
  * @param {boolean} [options.isResponse] Response path marker. When set,
  *   Forwarded is never synthesised regardless of `socket` (it would leak the
  *   proxy's own addresses downstream); an inbound Forwarded is still rejected.
- * @param {(acc: T, key: string, value: string) => T} fn Accumulator invoked
- *   once per retained header.
+ * @param {(acc: T, key: string, value: string | string[]) => T} fn Accumulator
+ *   invoked once per retained header. The value is an array when the field
+ *   appeared more than once (parseHeaders shape) — never pre-joined, because
+ *   fields like set-cookie (RFC 6265) must keep distinct field lines.
  * @param {T} acc Initial accumulator value.
  * @returns {T}
  */
@@ -262,7 +278,16 @@ function reduceHeaders({ headers, proxyName, httpVersion, socket, isResponse },
       (remove === null || !remove.includes(key.toLowerCase())) &&
       !isHopByHop(key)
     ) {
-      acc = fn(acc, key, headers[key].toString())
+      // A repeated field-line arrives as an array (parseHeaders collects
+      // them). Pass it through as-is — .toString() would comma-join with no
+      // space, corrupting fields whose values legally contain commas and must
+      // never be combined: set-cookie (RFC 9110 §5.3 / RFC 6265, e.g. an
+      // Expires date) and multi-challenge www-authenticate. Array values are
+      // exactly the shape parseHeaders delivers without this interceptor, and
+      // both the request path (undici accepts array header values) and the
+      // response handler chain already relay it.
+      const value = headers[key]
+      acc = fn(acc, key, Array.isArray(value) ? value : value.toString())
     }
   }
 
@@ -358,7 +383,10 @@ export default () => (dispatch) => (opts, handler) => {
       proxyName: opts.proxy.name,
     },
     (obj, key, val) => {
-      if (key === 'content-length' && !expectsPayload) {
+      // Case-insensitive (eqiLower) like reduceHeaders' capture above: the
+      // standalone interceptors.proxy() composition may pass mixed-case keys
+      // (the production path lowercases via parseHeaders first).
+      if (!expectsPayload && key.length === 14 && eqiLower(key, 'content-length')) {
         // https://tools.ietf.org/html/rfc7230#section-3.3.2
         // A user agent SHOULD NOT send a Content-Length header field when
         // the request message does not contain a payload body and the method
@@ -366,7 +394,7 @@ export default () => (dispatch) => (opts, handler) => {
         // undici will error if provided an unexpected content-length: 0 header.
       } else if (key[0] === ':') {
         // strip pseudo headers
-      } else if (key === 'expect') {
+      } else if (key.length === 6 && eqiLower(key, 'expect')) {
         // undici doesn't support expect header.
       } else {
         obj[key] = val

package/lib/interceptor/redirect.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { DecoratorHandler, isDisturbed, parseURL, parseHeaders } from '../utils.js'
+import { DecoratorHandler, isDisturbed, parseURL, parseHeaders, buildURL } from '../utils.js'
 
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 
@@ -105,9 +105,15 @@ class Handler extends DecoratorHandler {
       }
     }
 
-    const { origin, pathname, search } = parseURL(
-      new URL(this.#location, this.#opts.origin && new URL(this.#opts.path, this.#opts.origin)),
-    )
+    // Build the base URL by concatenating origin + path via buildURL rather
+    // than `new URL(path, origin)`: the latter is unsafe when `path` is
+    // protocol-relative (e.g. `//evil-host/x`, reachable via a request URL like
+    // `https://good.com//evil-host/x`). WHATWG URL would then treat the path's
+    // leading host as the authority and discard the good origin, so a *relative*
+    // Location would resolve against the attacker-controlled host — an SSRF /
+    // request-misrouting pivot. See buildURL in ../utils.js.
+    const base = this.#opts.origin && buildURL(this.#opts.origin, this.#opts.path)
+    const { origin, pathname, search } = parseURL(new URL(this.#location, base))
     const path = search ? `${pathname}${search}` : pathname
 
     // Remove headers referring to the original URL.
@@ -118,7 +124,7 @@ class Handler extends DecoratorHandler {
       headers: cleanRequestHeaders(
         this.#opts.headers,
         statusCode === 303,
-        this.#opts.origin !== origin,
+        !isSameOrigin(this.#opts.origin, origin),
       ),
       path,
       origin,
@@ -191,6 +197,27 @@ class Handler extends DecoratorHandler {
   }
 }
 
+// `target` is always a WHATWG-normalized origin (it comes off a parsed URL:
+// lowercased host, default port elided, no path), while `optsOrigin` is
+// caller-provided and may not be (trailing slash, explicit `:80`/`:443`,
+// uppercase host — defaultLookup in index.js even produces `http://host:80`
+// for object-form origins). A raw string compare misclassifies such
+// same-origin redirects as cross-origin and strips authorization/cookie,
+// breaking authenticated redirect flows with a confusing 401. Normalize
+// through `new URL` before comparing; if optsOrigin is not parseable, keep
+// the raw-compare result (already false here), which fails toward stripping —
+// the safe direction.
+function isSameOrigin(optsOrigin, target) {
+  if (optsOrigin === target) {
+    return true
+  }
+  try {
+    return new URL(optsOrigin).origin === target
+  } catch {
+    return false
+  }
+}
+
 // https://tools.ietf.org/html/rfc7231#section-6.4.4
 function shouldRemoveHeader(header, removeContent, unknownOrigin) {
   return (
@@ -199,6 +226,9 @@ function shouldRemoveHeader(header, removeContent, unknownOrigin) {
     (unknownOrigin &&
       header.length === 13 &&
       header.toString().toLowerCase() === 'authorization') ||
+    (unknownOrigin &&
+      header.length === 19 &&
+      header.toString().toLowerCase() === 'proxy-authorization') ||
     (unknownOrigin && header.length === 6 && header.toString().toLowerCase() === 'cookie')
   )
 }

package/lib/interceptor/request-body-factory.js

@@ -1,5 +1,5 @@
 import { Readable, finished } from 'node:stream'
-import { isStream } from '../utils.js'
+import { DecoratorHandler, isStream } from '../utils.js'
 
 function noop() {}
 
@@ -15,11 +15,26 @@ class FactoryStream extends Readable {
 
   _construct(callback) {
     this.#ac = new AbortController()
+    // Note: #ac is intentionally kept after the factory settles, so that a
+    // destroy with an error can still abort the factory's signal (see
+    // _destroy) — e.g. the request failing before undici started writing
+    // the body.
     Promise.resolve(this.#factory({ signal: this.#ac.signal })).then(
       (body) => {
-        this.#ac = null
         try {
-          if (typeof body === 'string' || body instanceof Buffer) {
+          // Normalize binary bodies to Buffer (zero-copy: reinterpret the same
+          // memory). Without this a TypedArray/DataView falls through to
+          // Readable.from(), which iterates e.g. a Uint8Array element-wise and
+          // push(number) then throws an uncaught ERR_INVALID_ARG_TYPE inside
+          // the 'data' emit. Mirrors utils.js isBuffer() treating Uint8Array
+          // as a buffer, extended to all ArrayBuffer views.
+          if (ArrayBuffer.isView(body) && !Buffer.isBuffer(body)) {
+            body = Buffer.from(body.buffer, body.byteOffset, body.byteLength)
+          } else if (body instanceof ArrayBuffer) {
+            body = Buffer.from(body)
+          }
+
+          if (typeof body === 'string' || Buffer.isBuffer(body)) {
             this.push(body)
             this.push(null)
           } else if (isStream(body)) {
@@ -67,7 +82,13 @@ class FactoryStream extends Readable {
 
   _destroy(err, callback) {
     if (this.#ac) {
-      this.#ac.abort(err)
+      // Abort the factory's signal on any error, and on a premature destroy
+      // (destroyed before 'end'), so the factory can cancel whatever it is
+      // producing. A clean destroy after a fully consumed body (autoDestroy
+      // after 'end') must not abort — the factory finished normally.
+      if (err || !this.readableEnded) {
+        this.#ac.abort(err)
+      }
       this.#ac = null
     }
 
@@ -80,7 +101,37 @@ class FactoryStream extends Readable {
   }
 }
 
-export default () => (dispatch) => (opts, handler) =>
-  typeof opts.body !== 'function'
-    ? dispatch(opts, handler)
-    : dispatch({ ...opts, body: new FactoryStream(opts.body).on('error', noop) }, handler)
+class Handler extends DecoratorHandler {
+  #body
+
+  constructor(handler, body) {
+    super(handler)
+    this.#body = body
+  }
+
+  onError(err) {
+    // Undici only destroys a request body once it has started writing it. If
+    // the dispatch fails before that (connect error/timeout, DNS failure,
+    // abort while queued, sync throw from an inner interceptor), nobody else
+    // owns the FactoryStream — but the factory has already run on nextTick
+    // (side effects, e.g. an open fd from fs.createReadStream), so destroy it
+    // here. destroy() is idempotent: if undici already consumed or destroyed
+    // the stream this is a no-op.
+    this.#body.destroy(err)
+    super.onError(err)
+  }
+}
+
+export default () => (dispatch) => (opts, handler) => {
+  if (typeof opts.body !== 'function') {
+    return dispatch(opts, handler)
+  }
+
+  const body = new FactoryStream(opts.body).on('error', noop)
+  try {
+    return dispatch({ ...opts, body }, new Handler(handler, body))
+  } catch (err) {
+    body.destroy(err)
+    throw err
+  }
+}

package/lib/interceptor/response-error.js

@@ -10,6 +10,7 @@ class Handler extends DecoratorHandler {
   #body = ''
   #bodySize = 0
   #opts
+  #reason = null
 
   constructor(opts, { handler }) {
     super(handler)
@@ -23,8 +24,14 @@ class Handler extends DecoratorHandler {
     this.#headers = null
     this.#body = ''
     this.#bodySize = 0
-
-    super.onConnect(abort)
+    this.#reason = null
+
+    super.onConnect((reason) => {
+      // Remember the abort reason so onError can recognize it. The reason is
+      // owned by the caller (e.g. signal.reason) and must not be decorated.
+      this.#reason = reason ?? null
+      abort(reason)
+    })
   }
 
   onHeaders(statusCode, headers, resume) {
@@ -81,6 +88,16 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
+    // An abort reason is owned by the caller and may be shared by every
+    // request in flight on the same signal — decorating it in place would
+    // permanently mutate the caller's object and leak one request's req/res
+    // onto another request's rejection (last writer wins). Callers also rely
+    // on receiving the exact reason object, so pass it through untouched.
+    if (err != null && (err === this.#reason || err === this.#opts.signal?.reason)) {
+      super.onError(err)
+      return
+    }
+
     super.onError(
       decorateError(err, this.#opts, {
         statusCode: this.#statusCode || undefined,