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
11 changes: 9 additions & 2 deletions src/remediation/npm-registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,11 @@ export async function resolvePublishedFixVersion(

const publishedVersions = Object.keys(packument.versions ?? {})
.filter(looksLikeVersion)
.filter(version => !isPreReleaseVersion(version))
.sort(compareVersions);

const fixedVersionHintIsPreRelease = isPreReleaseVersion(fixedVersionHint);

if (publishedVersions.includes(fixedVersionHint)) {
return {
resolvedVersion: fixedVersionHint,
Expand All @@ -193,7 +196,9 @@ export async function resolvePublishedFixVersion(
if (nearestPublishedVersion) {
return {
resolvedVersion: nearestPublishedVersion,
note: `Advisory fixed-version hint ${fixedVersionHint} is not published on npm for ${packageName}; using nearest published version ${nearestPublishedVersion}.`,
note: fixedVersionHintIsPreRelease
? `Advisory fixed-version hint ${fixedVersionHint} is a pre-release; using nearest published non-pre-release version ${nearestPublishedVersion}.`
: `Advisory fixed-version hint ${fixedVersionHint} is not published on npm for ${packageName}; using nearest published version ${nearestPublishedVersion}.`,
verified: true,
candidatesChecked: 0,
candidatesKnownVulnerable: 0,
Expand All @@ -204,7 +209,9 @@ export async function resolvePublishedFixVersion(

return {
resolvedVersion: null,
note: `Advisory fixed-version hint ${fixedVersionHint} is not published on npm for ${packageName}, and no published version >= ${fixedVersionHint} was found.`,
note: fixedVersionHintIsPreRelease
? `Advisory fixed-version hint ${fixedVersionHint} is a pre-release, and no published non-pre-release version >= ${fixedVersionHint} was found for ${packageName}.`
: `Advisory fixed-version hint ${fixedVersionHint} is not published on npm for ${packageName}, and no published version >= ${fixedVersionHint} was found.`,
verified: true,
candidatesChecked: 0,
candidatesKnownVulnerable: 0,
Expand Down
28 changes: 28 additions & 0 deletions tests/lowest-safe-version.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,32 @@ describe("resolvePublishedFixVersion", () => {
expect(result.resolvedVersion).toBe("1.2.4");
expect(result.note).toContain("using nearest published version 1.2.4");
});

it("does not return an exact pre-release fix hint (issue #1082)", async () => {
mockPackument(["1.2.3-rc.1", "1.2.3", "1.2.4"]);

const result = await resolvePublishedFixVersion("tar", "1.2.3-rc.1");

expect(result.resolvedVersion).toBe("1.2.3");
expect(result.note).toContain("using nearest published non-pre-release version 1.2.3");
expect(result.verified).toBe(true);
});

it("does not recommend a higher pre-release when the stable hint is unpublished", async () => {
mockPackument(["1.2.2", "1.2.4-beta.1"]);

const result = await resolvePublishedFixVersion("tar", "1.2.3");

expect(result.resolvedVersion).toBeNull();
});

it("returns null when only pre-release fix candidates are published (issue #1082)", async () => {
mockPackument(["1.2.2", "1.2.3-rc.1", "1.2.4-beta.1"]);

const result = await resolvePublishedFixVersion("tar", "1.2.3-rc.1");

expect(result.resolvedVersion).toBeNull();
expect(result.note).toContain("no published non-pre-release version");
expect(result.verified).toBe(true);
});
});