Skip to content

Commit 71b8620

Browse files
authored
Merge pull request #1564 from ChinthakaJ98/sync-main-with-4.1.4
2 parents 672eff1 + e3306a5 commit 71b8620

19 files changed

Lines changed: 618 additions & 591 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150

151151
- name: Run Trivy vulnerability scanner
152152
id: trivy
153-
continue-on-error: ${{ inputs.continueOnTrivyFailure }}
153+
continue-on-error: ${{ inputs.continueOnTrivyFailure == true }}
154154
uses: aquasecurity/trivy-action@0.35.0
155155
with:
156156
scan-type: 'fs'

.trivyignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,13 @@ CVE-2026-26996
1717
# file-type v19+ is ESM-only which is incompatible with the CommonJS VS Code extension build.
1818
# Upgrading requires significant refactoring. Risk is low as this package handles binary file detection.
1919
CVE-2026-31808
20+
21+
# brace-expansion DoS (GHSA-mh99-v99m-4gvg). The patched releases are already pinned:
22+
# 1.x -> 1.1.17, 2.x -> 2.1.3, 3.x -> 3.0.5, 5.x -> 5.0.8 (all carry the
23+
# EXPANSION_MAX / EXPANSION_MAX_LENGTH expansion caps that fix this CVE).
24+
# The advisory declares a single npm range "introduced=0, fixed=5.0.8", so Trivy still
25+
# flags the patched 1.x/2.x/3.x backports even though they contain the fix.
26+
# We cannot move every consumer to 5.x: brace-expansion 5.x changed `module.exports`
27+
# from a callable function to an object ({ expand, ... }), which breaks CommonJS
28+
# dependents such as minimatch@3 that call `require('brace-expansion')(...)` directly.
29+
CVE-2026-14257

common/autoinstallers/rush-plugins/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"fast-xml-builder": "1.1.7",
88
"fast-xml-parser": "5.7.0",
99
"minimatch": "3.1.5",
10-
"brace-expansion": "1.1.16",
10+
"brace-expansion": "1.1.17",
1111
"undici": "7.28.0"
1212
}
1313
},

common/autoinstallers/rush-plugins/pnpm-lock.yaml

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/config/rush/.pnpmfile.cjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ module.exports = {
121121
const currentVersion = deps['brace-expansion'];
122122
let newVersion;
123123
if (currentVersion.startsWith('^1') || currentVersion.startsWith('1')) {
124-
newVersion = '1.1.16';
124+
newVersion = '1.1.17';
125125
} else if (currentVersion.startsWith('^2') || currentVersion.startsWith('2')) {
126-
newVersion = '2.1.2';
126+
newVersion = '2.1.3';
127127
} else if (currentVersion.startsWith('^3') || currentVersion.startsWith('3')) {
128-
newVersion = '3.0.2';
128+
newVersion = '3.0.5';
129129
} else if (currentVersion.startsWith('^5') || currentVersion.startsWith('5')) {
130-
newVersion = '5.0.7';
130+
newVersion = '5.0.8'; // security fix: CVE-2026-45149 (DoS numeric range)
131131
} else {
132132
context.log(`Unexpected brace-expansion version: ${currentVersion}`);
133133
newVersion = currentVersion;

0 commit comments

Comments
 (0)