Skip to content

fix(review): preserve lockfile-tamper entry tracking across nested dependencies (#5837) #6038

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
loopover-orb merged 2 commits into from
Jul 15, 2026
Merged

fix(review): preserve lockfile-tamper entry tracking across nested dependencies (#5837) #6038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85962e1
fix: resolve lockfile-tamper entry tracking loss across nested deps
RealDiligent Jul 15, 2026
e4c4849
test: cover packages wrapper and optionalDependencies nesting paths
RealDiligent Jul 15, 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
27 changes: 17 additions & 10 deletions src/review/lockfile-tamper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ function versionChanged(removed: string | undefined, added: string | undefined):
* actively maintained repo's lockfile and is out of scope here. */
function scanPackageLockPatch(path: string, patch: string): LockfileTamperCandidate[] {
const byEntry = new Map<string, MutableCandidate>();
let currentEntryKey: string | null = null;
let currentPackageName: string | null = null;
let activeEntry: { entryKey: string; packageName: string } | null = null;
let innerObjectDepth = 0;
let sawPackagesEntry = false;

const entryFor = (entryKey: string, packageName: string): MutableCandidate => {
Expand All @@ -140,22 +140,29 @@ function scanPackageLockPatch(path: string, patch: string): LockfileTamperCandid
const key = objectHeader[1]!;
const nodeModulesPackage = npmPackageFromNodeModulesPath(key);
if (nodeModulesPackage) {
currentEntryKey = key;
currentPackageName = nodeModulesPackage;
activeEntry = { entryKey: key, packageName: nodeModulesPackage };
innerObjectDepth = 0;
sawPackagesEntry = true;
} else if (activeEntry) {
innerObjectDepth++;
} else if (!sawPackagesEntry && !CONTAINER_KEYS.has(key)) {
currentEntryKey = key;
currentPackageName = key;
activeEntry = { entryKey: key, packageName: key };
innerObjectDepth = 0;
} else {
currentEntryKey = null;
currentPackageName = null;
activeEntry = null;
innerObjectDepth = 0;
}
continue;
}
if (body === "}" || body.startsWith("},")) {
currentEntryKey = null;
currentPackageName = null;
if (innerObjectDepth > 0) {
innerObjectDepth--;
} else {
activeEntry = null;
}
}
const currentEntryKey = activeEntry?.entryKey ?? null;
const currentPackageName = activeEntry?.packageName ?? null;
if (!currentEntryKey || !currentPackageName || line.sign === " ") continue;

const resolvedMatch = /^"resolved"\s*:\s*"([^"]*)"/.exec(body);
Expand Down
73 changes: 73 additions & 0 deletions test/unit/lockfile-tamper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,4 +368,77 @@ describe("lockfileTamperRiskFinding", () => {
expect(finding?.detail).toContain("evil-pkg");
expect(finding?.detail).toContain("outside registry.npmjs.org");
});

// #5837: a nested "dependencies" sub-object inside a node_modules/... entry must not permanently drop
// tracking — resolved/integrity/version lines AFTER that sub-object must still attribute to the outer entry.
it("still flags tampered resolved/integrity when a nested dependencies sub-object precedes those fields (#5837)", () => {
const lockPatch = [
'@@ -1,14 +1,14 @@',
' "node_modules/foo": {',
' "dependencies": {',
' "bar": {',
' "version": "1.0.0"',
' }',
' },',
'- "version": "1.0.0",',
'- "resolved": "https://registry.npmjs.org/foo/-/foo-1.0.0.tgz",',
'- "integrity": "sha512-old=="',
'+ "version": "1.0.0",',
'+ "resolved": "https://registry.npmjs.org/foo/-/foo-1.0.0.tgz",',
'+ "integrity": "sha512-tampered=="',
' },',
].join("\n");
const finding = lockfileTamperRiskFinding([lockfilePatch(lockPatch)]);
expect(finding).not.toBeNull();
expect(finding?.detail).toContain("foo");
});

it("composes nested-dependencies tracking with full-path entry keying for two nested copies of the same package (#5837)", () => {
const lockPatch = [
'@@ -1,24 +1,24 @@',
' "node_modules/foo": {',
' "dependencies": {',
' "left-pad": {',
' "version": "1.0.0"',
' }',
' },',
' "version": "1.0.0",',
'- "integrity": "sha512-old1=="',
'+ "integrity": "sha512-new1=="',
' },',
' "node_modules/bar/node_modules/foo": {',
' "devDependencies": {',
' "left-pad": {',
' "version": "2.0.0"',
' }',
' },',
' "version": "2.0.0",',
'- "integrity": "sha512-old2=="',
'+ "integrity": "sha512-tampered2=="',
' },',
].join("\n");
const finding = lockfileTamperRiskFinding([lockfilePatch(lockPatch)]);
expect(finding).not.toBeNull();
expect(finding?.detail).toContain("foo");
});

it("tracks tamper signals inside a packages root wrapper and through optionalDependencies sub-objects", () => {
const lockPatch = [
'@@ -1,12 +1,12 @@',
' "packages": {',
' "node_modules/lodash": {',
' "optionalDependencies": {',
' "left-pad": {',
' "version": "1.0.0"',
' }',
' },',
'- "integrity": "sha512-old=="',
'+ "integrity": "sha512-tampered=="',
' }',
' },',
].join("\n");
const finding = lockfileTamperRiskFinding([lockfilePatch(lockPatch)]);
expect(finding).not.toBeNull();
expect(finding?.detail).toContain("lodash");
});
});