From e387b39fcf0ed02b3669208d04ad86aab63b709a Mon Sep 17 00:00:00 2001 From: Derek Date: Thu, 29 Oct 2026 00:07:06 +1100 Subject: [PATCH] fix(security): pin undici 7.30.1 and record qs and deepmerge Take undici to 7.30.1 through the security layer. The copy under the AI SDK ships in the image, and the fix is one generated line that unwinds at the next sync, since upstream already moved to 7.30.1. node-gyp's 8.x copy, macOS build tooling, moves with it. qs and deepmerge are recorded in osv-scanner.toml. Nothing shipped calls qs.stringify with the comma array format, and deepmerge has no fixed release and only jest and Storybook pull it in. Also drop the three undici osv ignores the pin makes unused, and stop naming the removed patch 0003 and inflate test by path in security-sync.md. --- docs/fork/security-sync.md | 61 ++++++++++++++++++++++++++---------- docs/fork/what-we-changed.md | 16 +++++----- osv-scanner.toml | 20 +++++------- package.json | 3 +- security/overrides.yaml | 20 ++++++++++++ yarn.lock | 15 +++------ 6 files changed, 86 insertions(+), 49 deletions(-) diff --git a/docs/fork/security-sync.md b/docs/fork/security-sync.md index 6254f3bf..6a1169ec 100644 --- a/docs/fork/security-sync.md +++ b/docs/fork/security-sync.md @@ -1679,24 +1679,25 @@ With `inflate: false` set, `contentstream()` raises a 415 at `lib/read.js:158` before any decompression stream exists, and `appErrorHandler` returns it as JSON because http-errors carries `statusCode`. -Carried as `security/patches/0003-body-parser-no-inflate.patch`, not as a pin, -because `npmMinimalAgeGate: 7d` refuses 1.20.9: it was published -2026-10-22T11:38Z, so `yarn install` answers -`All versions satisfying "^1.20.9" are quarantined`. A drafted -`security/overrides.yaml` entry was removed rather than left in the register, -since a register entry that cannot install fails `--verify` for everyone. +Carried as patch 0003, removed on 2026-10-28 (below), not as a pin, because +`npmMinimalAgeGate: 7d` refuses 1.20.9: it was published 2026-10-22T11:38Z, so +`yarn install` answers `All versions satisfying "^1.20.9" are quarantined`. A +drafted `security/overrides.yaml` entry was removed rather than left in the +register, since a register entry that cannot install fails `--verify` for +everyone. **From 2026-10-29**, add the `^1.20.9` pin, run `--apply && yarn install`, and delete patch 0003 in the same change. That also covers the OpAMP and PromQL mounts. -`packages/api/src/dfe/__tests__/body-parser-inflate.test.ts` asserts, per mount, -that the shipped source declares `inflate: false` and that the parser 415s a -gzip and a deflate body while still parsing an uncompressed one. The behaviour -half rebuilds each parser from the same options rather than importing the real -app, which opens a Mongo session store at import. So the source-text assertion -is what ties the test to the shipped mounts, and it is the half that fails when -the patch is stripped. +`body-parser-inflate.test.ts`, replaced on 2026-10-28 by +`packages/api/src/dfe/__tests__/body-parser-version.test.ts`, asserted, per +mount, that the shipped source declares `inflate: false` and that the parser +415s a gzip and a deflate body while still parsing an uncompressed one. The +behaviour half rebuilds each parser from the same options rather than importing +the real app, which opens a Mongo session store at import. So the source-text +assertion is what ties the test to the shipped mounts, and it is the half that +fails when the patch is stripped. ### zod GHSA-mrhx-c7xc-m3w5 - the range spans a major the code does not @@ -2029,10 +2030,9 @@ Recorded as mitigated rather than fixed. No 3.x release carries the fix, and ## 2026-10-28 - body-parser 1.20.9 pinned, patch 0003 dropped GHSA-27r3-jxmh-p828 is fixed by the `body-parser ^1.20.9` entry in -`security/overrides.yaml`, and -`security/patches/0003-body-parser-no-inflate.patch` is gone with its -`inflate: false` hunks in `api-app.ts`. The pin covers every mount, including -the OpAMP and PromQL parsers the patch left inflating. +`security/overrides.yaml`, and patch 0003 is gone with its `inflate: false` +hunks in `api-app.ts`. The pin covers every mount, including the OpAMP and +PromQL parsers the patch left inflating. body-parser 1.20.9 was published 2026-10-22T11:38Z, six days before this change. `npmMinimalAgeGate: 7d` refuses it until 2026-10-29, so `.yarnrc.yml` carries a @@ -2050,3 +2050,30 @@ The lockfile moves two things: `dfe/__tests__/body-parser-version.test.ts`, which resolves body-parser from express and fails below 1.20.9. The `osv-scanner.toml` ignore for the advisory is deleted, since the lockfile no longer carries an affected version. + +## 2026-10-29 - undici pinned, qs and deepmerge recorded + +Thirteen Dependabot alerts, graded against the root Dockerfile's image. + +| Alerts | Package | Verdict | +| ------- | ----------------------------- | ------------------------------------------------------------------------------------------- | +| 386-395 | undici 7.30.0, 8.11.2 | pinned `^7.30.1` in `security/overrides.yaml`, no live vector (the register entry says why) | +| 385 | qs 6.14.2, 6.15.1 | recorded in `osv-scanner.toml`: the throw needs `qs.stringify` with `arrayFormat: 'comma'` | +| 384 | postcss-selector-parser 6.1.4 | already recorded in `osv-scanner.toml`: CSS-modules build plugins under Storybook | +| 396 | deepmerge 4.3.1 | recorded in `osv-scanner.toml`: no fixed release, jest and Storybook only | + +The undici pin is one generated line and upstream already took 7.30.1 in +hyperdxio/hyperdx#3462, so `--check` unwinds it at the next sync. It also moves +node-gyp's 8.11.2 to 7.30.1. node-gyp installs only on macOS, under fsevents, +and 7.30.1 exports the `Agent`, `EnvHttpProxyAgent`, `RetryAgent` and `fetch` +its `lib/download.js:2` takes. The image's Node 24.22.1 reports +`process.versions.undici` 7.30.1, so the global `fetch` the provider calls use +is already patched. + +The three undici ignores in `osv-scanner.toml` (GHSA-4qv8-2p9j-2685, +GHSA-f72v-6w45-q472, GHSA-xjj6-f33q-929c) are deleted, because the lockfile no +longer carries an affected version. + +| Run | main | This change | +| -------------------------- | ------------------------------------- | --------------- | +| osv-scanner on `yarn.lock` | 13 rows: undici x10, qs x2, deepmerge | no issues found | diff --git a/docs/fork/what-we-changed.md b/docs/fork/what-we-changed.md index 6de54e7e..141c5a72 100644 --- a/docs/fork/what-we-changed.md +++ b/docs/fork/what-we-changed.md @@ -624,15 +624,15 @@ header check is what holds when a deployment authenticates some other way. touched the file four times, and the conflict is trivial either way: take ours, then re-run `yarn ratchet:update` after the sync so the numbers match the merged tree. -- `package.json` `resolutions` - four generated fork pins, +- `package.json` `resolutions` - five generated fork pins, `systeminformation ^5.31.7`, raising upstream's own `^5.24.0`, and - `follow-redirects ^1.16.1`, `next ^16.4.1` and `body-parser ^1.20.9`, which - upstream does not pin. All four are generated from `security/overrides.yaml` - by `scripts/security-override.py --apply`, so edit the register, never these - lines. The vectors are in the register entries. `--check` judges the pin - against upstream's own lockfile at our merge base, never ours: the pin makes - our lockfile resolve above its own floor, so ours would call every live pin - redundant. + `follow-redirects ^1.16.1`, `next ^16.4.1`, `body-parser ^1.20.9` and + `undici ^7.30.1`, which upstream does not pin. All five are generated from + `security/overrides.yaml` by `scripts/security-override.py --apply`, so edit + the register, never these lines. The vectors are in the register entries. + `--check` judges the pin against upstream's own lockfile at our merge base, + never ours: the pin makes our lockfile resolve above its own floor, so ours + would call every live pin redundant. ## Docs diff --git a/osv-scanner.toml b/osv-scanner.toml index 52760b8c..fa6be9aa 100644 --- a/osv-scanner.toml +++ b/osv-scanner.toml @@ -133,6 +133,10 @@ reason = "cross-spawn 5.1.0: spawndamnit under @changesets/cli, not in the image id = "GHSA-8cw4-87c7-c6xx" reason = "csv-parse: csv under @changesets/cli, not in the image." +[[IgnoredVulns]] +id = "GHSA-gcqx-w48m-w2h4" +reason = "deepmerge 4.3.1: no fixed release. jest-config and Storybook's fork-ts-checker-webpack-plugin, both devDependencies, not in the image." + [[IgnoredVulns]] id = "GHSA-848j-6mx2-7j84" reason = "elliptic: no fixed release. browserify-sign and create-ecdh under Storybook, not in the image." @@ -305,6 +309,10 @@ reason = "qs: the crash is in qs.stringify, and express and body-parser only cal id = "GHSA-x5fp-wj9c-mxmx" reason = "qs: tolerable risk. express parses every query string and urlencoded body with it, behind the OIDC gateway; moderate, and express's ~6.14.0 admits no fix." +[[IgnoredVulns]] +id = "GHSA-6pq8-jhm2-2vcw" +reason = "qs: the throw needs qs.stringify with arrayFormat 'comma'. express 4.22.1 only calls qs.parse (lib/utils.js:289), and no workspace source or shipped dependency passes 'comma'. 6.15.1 is typed-rest-client under Stryker." + [[IgnoredVulns]] id = "GHSA-mw96-cpmx-2vgc" reason = "rollup 2.79.2: @stoplight/spectral-ruleset-bundler, lint tooling, not in the image." @@ -341,18 +349,6 @@ reason = "tmp 0.0.33: external-editor under CLI prompts, not in the image." id = "GHSA-ph9p-34f9-6g65" reason = "tmp 0.0.33: external-editor under CLI prompts, not in the image." -[[IgnoredVulns]] -id = "GHSA-4qv8-2p9j-2685" -reason = "undici: 7.30.0 is the AI SDK's fetch for untrusted URLs in a prompt, the api sends text prompts only, and the AI routes throw unless AI_PROVIDER or ANTHROPIC_API_KEY is set. 8.11.2 is node-gyp, build tooling." - -[[IgnoredVulns]] -id = "GHSA-f72v-6w45-q472" -reason = "undici: 7.30.0 is the AI SDK's fetch for untrusted URLs in a prompt, the api sends text prompts only, and the AI routes throw unless AI_PROVIDER or ANTHROPIC_API_KEY is set. 8.11.2 is node-gyp, build tooling." - -[[IgnoredVulns]] -id = "GHSA-xjj6-f33q-929c" -reason = "undici: 7.30.0 is the AI SDK's fetch for untrusted URLs in a prompt, the api sends text prompts only, and the AI routes throw unless AI_PROVIDER or ANTHROPIC_API_KEY is set. 8.11.2 is node-gyp, build tooling." - [[IgnoredVulns]] id = "GHSA-w5hq-g745-h8pq" reason = "uuid 8.3.2: every shipped caller uses v4(), which checks bounds; the flaw is in v3, v5 and v6 with a caller buffer." diff --git a/package.json b/package.json index 5a163326..61b3ea26 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,8 @@ "@asyncapi/specs": "6.11.1", "follow-redirects": "^1.16.1", "next": "^16.4.1", - "body-parser": "^1.20.9" + "body-parser": "^1.20.9", + "undici": "^7.30.1" }, "resolutionsNotes": { "@stryker-mutator/core/minimatch": "Dev tooling, not a CVE override. Added when a blanket `brace-expansion` pin forced v2 (CJS) while minimatch v10 needs v5's named exports. That blanket pin is gone — it broke `nx affected` the same way — so brace-expansion now resolves per consumer and Stryker would most likely work on minimatch v10. The pin stays because no CI job runs `yarn dev:mutation`, so nothing would catch it if that guess is wrong. Drop it once someone has run the mutation suite on v10. See CONTRIBUTING.md#mutation-tests." diff --git a/security/overrides.yaml b/security/overrides.yaml index 9783da75..295cdabf 100644 --- a/security/overrides.yaml +++ b/security/overrides.yaml @@ -111,6 +111,26 @@ overrides: stay inflating. upstream: none added: 2026-10-28 + - package: undici + range: '^7.30.1' + advisory: GHSA-qrxm-fqhp-jwvm + severity: high + vector: >- + No live vector. It is pinned because the vulnerable copy ships and the fix + is one generated line. packages/api/package.json declares ai, + @ai-sdk/anthropic and @ai-sdk/openai, whose @ai-sdk/provider-utils 5.0.49 + resolves undici 7.30.0 into the production focus. provider-utils loads it + only in createSafeNodeFetch (src/safe-node-fetch.ts:146), the dispatcher + for untrusted URL downloads, and builds that Agent with connect.lookup + alone. The API's one model call (routers/api/ai.ts:104) passes a string + prompt, so nothing is downloaded, and provider requests go through Node's + own fetch. GHSA-qrxm-fqhp-jwvm needs a TLS 1.2 peer reached through that + dispatcher, GHSA-2m5v-pch6-74hx a function-valued tls option and + GHSA-4w7w-5xrc-9h26 the cache interceptor. The pin also takes node-gyp's + 8.11.2, a macOS-only fsevents build dependency, to 7.30.1, which has every + export node-gyp 13 uses (lib/download.js:2). + upstream: https://github.com/hyperdxio/hyperdx/pull/3462 + added: 2026-10-29 # Example of the shape (keep commented - an empty register is the goal state): # # - package: some-parser diff --git a/yarn.lock b/yarn.lock index 53aaee58..3cd4ece0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30833,17 +30833,10 @@ __metadata: languageName: node linkType: hard -"undici@npm:^7.29.0": - version: 7.30.0 - resolution: "undici@npm:7.30.0" - checksum: 10c0/011a321a9198532b0f0504740faa43b9ab8fcc0e4f60104e5c9cb808a61faeb03e4be4aec4f0c65f47913d7c7d9d91591793a6cb9ab843f98ca2c3d711c4a34c - languageName: node - linkType: hard - -"undici@npm:^8.4.1": - version: 8.11.2 - resolution: "undici@npm:8.11.2" - checksum: 10c0/106f6991178fb7562fd90cdec7993c5f807a9428682306091f0c4b27fc474ec291f868e29972c6252988bf061ad193df943b3b99e775be157a28d92bbb95699d +"undici@npm:^7.30.1": + version: 7.30.1 + resolution: "undici@npm:7.30.1" + checksum: 10c0/c838089b010e8e28a9a5358d4bf4621e0c8d7bb70058b23e819667349c4c0b6791a7c8bc9bbe94ff0923db132faae0d9d9592b9743eda4f2b49466fa57482213 languageName: node linkType: hard