Skip to content

fix: override diff package to patched versions #26728

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
frankmueller-msft merged 6 commits into from
Mar 18, 2026
+200 −158
Merged

fix: override diff package to patched versions #26728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5a4fa3
fix: override diff package to patched versions (ReDoS)
frankmueller-msft Mar 14, 2026
e31c479
Bump direct diff devDependency from ^3.5.0 to ^4.0.4
frankmueller-msft Mar 16, 2026
f18161a
Update test fixture lockfile: js-yaml 3.14.1 → 3.14.2
frankmueller-msft Mar 17, 2026
2160a03
Add js-yaml and jws overrides to root workspace
frankmueller-msft Mar 17, 2026
14c1da2
Merge branch 'main' into fix/diff-security-override
frankmueller-msft Mar 17, 2026
4999431
Remove js-yaml and jws overrides from root workspace
frankmueller-msft Mar 18, 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
4 changes: 4 additions & 0 deletions build-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,14 @@
"js-yaml: overridden to fix a known vulnerability (prototype pollution via merge keys).",
"mdast-util-to-hast: overridden to ^13.2.1 to fix a known vulnerability (unsanitized class attribute injection).",
"simple-git: overridden to ^3.32.3 to resolve a CG alert.",
"diff: overridden to patched versions to resolve a known ReDoS vulnerability. diff@7.x has no fix so it is bumped to 8.0.3.",
"tar: overridden to ^7.5.11 to resolve multiple security vulnerabilities in tar 6.x (EOL, no backport)."
],
"overrides": {
"@types/glob>@types/minimatch": "~5.1.2",
"diff@>=4 <5": "^4.0.4",
"diff@>=7 <8": "^8.0.3",
"diff@>=8 <9": "^8.0.3",
"@types/node": "^22.19.1",
"eslint": "~9.39.2",
"json5@<1.0.2": "^1.0.2",
Expand Down
27 changes: 12 additions & 15 deletions build-tools/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions build-tools/syncpack.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ module.exports = {
label: "Ignore unsupported pnpm override entries",
dependencyTypes: ["pnpmOverrides"],
dependencies: [
"diff@>=4 <5",
"diff@>=7 <8",
"diff@>=8 <9",
"js-yaml@<4",
"js-yaml@>=4",
"json5@<1.0.2",
Expand Down
4 changes: 3 additions & 1 deletion common/build/eslint-config-fluid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@
"pnpm": {
"commentsOverrides": [
"serialize-javascript - CVE-2024-11831 impacts version 6.0.0 which is pinned by mocha 10.4.0, which in turn comes from mocha-multi-reporters 1.5.1 (which has no updated version at this time)",
"js-yaml: overridden to fix CVE-2025-64718 (prototype pollution via merge keys)."
"js-yaml: overridden to fix CVE-2025-64718 (prototype pollution via merge keys).",
"diff: overridden to patched version to resolve a known ReDoS vulnerability."
],
"overrides": {
"diff@>=5 <6": "^5.2.2",
"js-yaml": "^4.1.1",
"mocha>serialize-javascript@6.0.0": "^6.0.2"
},
Expand Down
9 changes: 5 additions & 4 deletions common/build/eslint-config-fluid/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion common/build/eslint-plugin-fluid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@
"commentsOverrides": [
"validator: overridden to ^13.15.0 to resolve a known vulnerability in older versions (transitive via swagger-tools).",
"qs: overridden to ^6.15.0 to resolve a known vulnerability in older versions.",
"js-yaml: overridden to fix CVE-2025-64718 (prototype pollution via merge keys)."
"js-yaml: overridden to fix CVE-2025-64718 (prototype pollution via merge keys).",
"diff: overridden to patched version to resolve a known ReDoS vulnerability."
],
"overrides": {
"diff@>=5 <6": "^5.2.2",
"js-yaml": "^4.1.1",
"qs": "^6.15.0",
"validator": "^13.15.0"
Expand Down
9 changes: 5 additions & 4 deletions common/build/eslint-plugin-fluid/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions common/lib/common-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,13 @@
"qs: overridden to ^6.15.0 to resolve a known vulnerability in older versions.",
"js-yaml: overridden to fix a known vulnerability (prototype pollution via merge keys).",
"simple-git: overridden to ^3.32.3 to resolve a CG alert.",
"diff: overridden to patched versions to resolve a known ReDoS vulnerability.",
"tar: overridden to ^7.5.11 to resolve multiple security vulnerabilities in tar 6.x (EOL, no backport)."
],
"overrides": {
"diff@>=4 <5": "^4.0.4",
"diff@>=5 <6": "^5.2.2",
"diff@>=8 <9": "^8.0.3",
"js-yaml@<4": "^3.14.2",
"js-yaml@>=4": "^4.1.1",
"jws": "^3.2.3",
Expand Down
29 changes: 16 additions & 13 deletions common/lib/common-utils/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions common/lib/protocol-definitions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"qs: overridden to ^6.15.0 to resolve a known vulnerability in older versions.",
"js-yaml: overridden to fix a known vulnerability (prototype pollution via merge keys).",
"simple-git: overridden to ^3.32.3 to resolve a CG alert.",
"diff: overridden to patched version to resolve a known ReDoS vulnerability.",
"tar: overridden to ^7.5.11 to resolve multiple security vulnerabilities in tar 6.x (EOL, no backport)."
],
"onlyBuiltDependencies": [
Expand All @@ -135,6 +136,7 @@
]
},
"overrides": {
"diff@>=8 <9": "^8.0.3",
"js-yaml@<4": "^3.14.2",
"jws": "^3.2.3",
"oclif>@aws-sdk/client-cloudfront": "-",
Expand Down
9 changes: 5 additions & 4 deletions common/lib/protocol-definitions/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,12 @@
"js-yaml: overridden to fix a known vulnerability (prototype pollution via merge keys).",
"mdast-util-to-hast: overridden to ^13.2.1 to fix a known vulnerability (unsanitized class attribute injection).",
"node-forge: overridden to ^1.3.2 to fix known ASN.1 vulnerabilities.",
"simple-git: overridden to ^3.32.3 to resolve a CG alert."
"simple-git: overridden to ^3.32.3 to resolve a CG alert.",
"diff: overridden to patched version to resolve a known ReDoS vulnerability."
],
"overrides": {
"@types/react": "^18.3.12",
"diff@>=5 <6": "^5.2.2",
"js-yaml@<4": "^3.14.2",
"js-yaml@>=4": "^4.1.1",
"jws": "^3.2.3",
Expand Down
Loading
Loading