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
12 changes: 6 additions & 6 deletions backend/package-lock.json

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

4 changes: 4 additions & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,9 @@
"tsx": "^4.19.3",
"typescript": "^5.8.3"
},
"overrides": {
"fast-uri": "3.1.5",
"ip-address": "10.4.0"
},
"license": "AGPL-3.0-only"
}
10 changes: 6 additions & 4 deletions frontend/package-lock.json

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

3 changes: 2 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
"wrangler": "^4.90.0"
},
"overrides": {
"brace-expansion": "5.0.8",
"brace-expansion": "5.0.9",
"undici": "7.29.0",
"postcss": "8.5.22",
"sharp": "0.35.3"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/scripts/patch-brace-expansion-compat.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const root = resolve(import.meta.dirname, "..");
const lock = JSON.parse(
readFileSync(resolve(root, "package-lock.json"), "utf8"),
);
const safeVersion = "5.0.8";
const safeVersion = "5.0.9";
const legacyRequire =
/require\((["'])brace-expansion\1\)(?!\.expand)/g;
const legacyImport =
Expand Down
22 changes: 11 additions & 11 deletions reports/release-manifest-v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@
},
{
"path": "backend/package-lock.json",
"sha256": "025dd00b9f216a2d3c27bd6d95cbae1f3b8a6e85d5a60d9833fc968624f7034e",
"sha256": "5883f47e70fb6e28c5db04c0a4b341bb21b3b2372c31370a767a961704d9359c",
"sizeBytes": 203235
},
{
"path": "backend/package.json",
"sha256": "51d850edb17c47a0f0f7a3254079579ea34a8b20d8260d2ba49e7bafc6278bca",
"sizeBytes": 1620
"sha256": "db135dc85184779164869ebc1d2f86997a93f37087a7abe04fcb3dac0d6afde1",
"sizeBytes": 1694
},
{
"path": "backend/scripts/restore-storage-exercise.mjs",
Expand Down Expand Up @@ -357,13 +357,13 @@
},
{
"path": "frontend/package-lock.json",
"sha256": "78c5149b7d30f1d3e39e545a995e8bf537a1368b302fd8ca452ddaffbe811fef",
"sizeBytes": 533845
"sha256": "40618e553ad2a981be05db111ba9c7150910d28807325d29441ec9fe505aab6d",
"sizeBytes": 534050
},
{
"path": "frontend/package.json",
"sha256": "22b09b9350f124db43a922da2add4519c2a6fad1bf5891fbc2a77683b8d614ab",
"sizeBytes": 2969
"sha256": "e42439de3ef3f2102cb6145cac418d78f0e94328a3fbcf4769a977fa4e085911",
"sizeBytes": 2997
},
{
"path": "frontend/src/app/components/projects/ProjectDocumentsView.tsx",
Expand Down Expand Up @@ -627,13 +627,13 @@
},
{
"path": "website/package-lock.json",
"sha256": "ecba6ff6eb960dc0c841e64c1752cd19ddbc573b0cce71739cce9411ad22184a",
"sizeBytes": 259462
"sha256": "999aac2f2d545632172460dc2182f34425951a7cde2ad041dab9b8873bb9b8d7",
"sizeBytes": 259851
},
{
"path": "website/package.json",
"sha256": "7cac4f02832a884ada383e460ed7b943b87a6dee86bf1713de6e6d77617eb40f",
"sizeBytes": 1621
"sha256": "6d8b98afb2798f77766a225e21d7dc00554ea8b94371fc43c3f05a0715207669",
"sizeBytes": 1645
},
{
"path": "website/app/site-config.ts",
Expand Down
35 changes: 32 additions & 3 deletions tests/baseline/ross-dependency-security-regressions.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test("every npm workspace resolves the patched brace-expansion release", () => {
const packageJson = json(`${workspace}/package.json`);
const lock = json(`${workspace}/package-lock.json`);

assert.equal(packageJson.overrides["brace-expansion"], "5.0.8");
assert.equal(packageJson.overrides["brace-expansion"], "5.0.9");
assert.equal(
packageJson.scripts.postinstall,
"node scripts/patch-brace-expansion-compat.mjs",
Expand All @@ -25,7 +25,7 @@ test("every npm workspace resolves the patched brace-expansion release", () => {
});
assert.ok(bracePackages.length > 0);
for (const [path, record] of bracePackages) {
assert.equal(record.version, "5.0.8", `${workspace}/${path}`);
assert.equal(record.version, "5.0.9", `${workspace}/${path}`);
assert.doesNotMatch(String(record.resolved), /^file:/);
}
}
Expand All @@ -40,14 +40,43 @@ test("legacy minimatch compatibility patching is deterministic and fail closed",
);

assert.equal(frontendPatch, websitePatch);
assert.match(frontendPatch, /safeVersion = "5\.0\.8"/);
assert.match(frontendPatch, /safeVersion = "5\.0\.9"/);
assert.match(frontendPatch, /require\\.*brace-expansion/);
assert.match(frontendPatch, /import\\s\+/);
assert.match(frontendPatch, /failed a basic glob match/);
assert.match(frontendPatch, /failed a basic brace expansion/);
assert.match(frontendPatch, /No installed minimatch package was available/);
});

test("security-sensitive transitive dependencies stay on fixed releases", () => {
const workspaces = {
backend: { fastUri: "3.1.5", ipAddress: "10.4.0" },
frontend: { undici: "7.29.0" },
website: { fastUri: "3.1.5", undici: "7.29.0" },
};

for (const [workspace, expected] of Object.entries(workspaces)) {
const packageJson = json(`${workspace}/package.json`);
const lock = json(`${workspace}/package-lock.json`);
const overrides = packageJson.overrides ?? {};

for (const [dependency, version] of Object.entries({
...(expected.fastUri ? { "fast-uri": expected.fastUri } : {}),
...(expected.ipAddress ? { "ip-address": expected.ipAddress } : {}),
...(expected.undici ? { undici: expected.undici } : {}),
})) {
assert.equal(overrides[dependency], version);
const resolved = Object.entries(lock.packages).filter(([path]) =>
path === `node_modules/${dependency}` ||
path.endsWith(`/node_modules/${dependency}`),
);
assert.ok(resolved.length > 0, `${workspace} must lock ${dependency}`);
for (const [path, record] of resolved)
assert.equal(record.version, version, `${workspace}/${path}`);
}
}
});

test("React server components and Next.js use their current patched releases", () => {
const frontendPackage = json("frontend/package.json");
const websitePackage = json("website/package.json");
Expand Down
14 changes: 9 additions & 5 deletions website/package-lock.json

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

5 changes: 3 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@
"wrangler": "4.114.0"
},
"overrides": {
"brace-expansion": "5.0.8",
"fast-uri": "3.1.4",
"brace-expansion": "5.0.9",
"fast-uri": "3.1.5",
"undici": "7.29.0",
"postcss": "8.5.22",
"sharp": "0.35.3"
},
Expand Down
2 changes: 1 addition & 1 deletion website/scripts/patch-brace-expansion-compat.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const root = resolve(import.meta.dirname, "..");
const lock = JSON.parse(
readFileSync(resolve(root, "package-lock.json"), "utf8"),
);
const safeVersion = "5.0.8";
const safeVersion = "5.0.9";
const legacyRequire =
/require\((["'])brace-expansion\1\)(?!\.expand)/g;
const legacyImport =
Expand Down