Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

### Security

- Upgrade the pinned CycloneDX SBOM generator to 6.0.0 to fix Windows
workspace-argument shell injection (`GHSA-q69g-4hcv-6jg4`). Guard the
manifest and every lockfile copy against reintroducing a vulnerable release.
- Port the dependency security fixes from the Full edition without changing
the macOS Author version or capability boundary: require xmldom 0.8.15+,
brace-expansion 1.1.18 / 2.1.4 / 5.0.9, and nanoid 3.3.18+.
Expand Down
2 changes: 2 additions & 0 deletions docs/src/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ shipped semver tag; older entries summarize the foundational work by theme.

## Unreleased

- **SBOM tooling security:** Pin CycloneDX npm 6.0.0 to address
`GHSA-q69g-4hcv-6jg4`, with regression coverage for resolved versions.
- **Dependency security:** Port patched xmldom, brace-expansion, and nanoid
dependencies, and update Electron to 42.11.3 to remove the vulnerable
legacy ZIP extractor. The macOS Author version and author-only capability
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"locales:review": "node scripts/review-locales.mjs"
},
"devDependencies": {
"@cyclonedx/cyclonedx-npm": "5.0.0",
"@cyclonedx/cyclonedx-npm": "6.0.0",
"@playwright/test": "^1.59.1",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
Expand Down
21 changes: 21 additions & 0 deletions scripts/release-metadata.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,27 @@ describe('public release metadata', () => {
expect(nonPublic).toEqual([]);
});

it('pins a patched CycloneDX SBOM generator without vulnerable resolved copies', async () => {
const [packageJson, lockfile] = await Promise.all([
read('package.json').then(JSON.parse),
read('package-lock.json').then(JSON.parse),
]);
const dependency = '@cyclonedx/cyclonedx-npm';
const pinned = packageJson.devDependencies[dependency];
const version = /^(\d+)\.\d+\.\d+$/.exec(pinned);
const copies = Object.entries(lockfile.packages)
.filter(([packagePath]) => packagePath.endsWith(`node_modules/${dependency}`));

expect(version, pinned).not.toBeNull();
expect(Number(version?.[1])).toBeGreaterThanOrEqual(6);
expect(lockfile.packages[''].devDependencies[dependency]).toBe(pinned);
expect(copies.length).toBeGreaterThan(0);
for (const [packagePath, metadata] of copies) {
expect(metadata.version, packagePath).toBe(pinned);
expect(metadata.dev, packagePath).toBe(true);
}
});

it('pins patched brace-expansion versions in every supported major', async () => {
const [packageJson, lockfile] = await Promise.all([
read('package.json').then(JSON.parse),
Expand Down
Loading