Skip to content
Open
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
29 changes: 29 additions & 0 deletions src/__tests__/parser.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { describe, it, expect } from 'vitest';
import { parse, detectFormat } from '../parser.js';
import { diff } from '../diff.js';

const cyclonedxFixture = {
bomFormat: 'CycloneDX',
Expand Down Expand Up @@ -119,6 +120,34 @@ describe('parse (SPDX)', () => {
expect(sbom.components[0].version).toBe('2.28.0');
expect(sbom.components[0].license).toBe('Apache-2.0');
});

it('treats NOASSERTION/NONE version and supplier sentinels as undefined', () => {
const sbom = parse({
spdxVersion: 'SPDX-2.3',
name: 'my-service',
packages: [
{ name: 'internal-lib', versionInfo: 'NOASSERTION', supplier: 'NOASSERTION' },
{ name: 'other-lib', versionInfo: 'NONE', supplier: 'Organization: Acme' },
],
});
expect(sbom.components[0].version).toBeUndefined();
expect(sbom.components[0].supplier).toBeUndefined();
expect(sbom.components[1].version).toBeUndefined();
expect(sbom.components[1].supplier).toBe('Organization: Acme');
});

it('does not report a spurious upgrade when the old version is NOASSERTION', () => {
const old = parse({
spdxVersion: 'SPDX-2.3',
packages: [{ name: 'internal-lib', versionInfo: 'NOASSERTION' }],
});
const next = parse({
spdxVersion: 'SPDX-2.3',
packages: [{ name: 'internal-lib', versionInfo: '2.0.0' }],
});
const report = diff(old, next);
expect(report.upgraded).toHaveLength(0);
});
});

describe('parse (JSON string input)', () => {
Expand Down
24 changes: 22 additions & 2 deletions src/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ export function parseSPDX(obj: Record<string, unknown>): SBOM {
const components: Component[] = packages.map((pkg: Record<string, unknown>) => ({
purl: extractSPDXPurl(pkg),
name: typeof pkg.name === 'string' ? pkg.name : 'unknown',
version: typeof pkg.versionInfo === 'string' ? pkg.versionInfo : undefined,
version: normalizeSPDXValue(pkg.versionInfo),
license: typeof pkg.licenseConcluded === 'string' ? pkg.licenseConcluded : undefined,
ecosystem: extractEcosystemFromPurl(extractSPDXPurl(pkg) ?? ''),
supplier: typeof pkg.supplier === 'string' ? pkg.supplier : undefined,
supplier: normalizeSPDXValue(pkg.supplier),
}));

return {
Expand Down Expand Up @@ -161,6 +161,26 @@ function extractCycloneDXTimestamp(metadata: Record<string, unknown>): string |
return typeof metadata.timestamp === 'string' ? metadata.timestamp : undefined;
}

/**
* Normalize an SPDX string field, treating the spec's `NOASSERTION` and `NONE`
* sentinels as "no value" (undefined) rather than real data.
*
* These sentinels are extremely common in generator output (e.g. `versionInfo:
* "NOASSERTION"` when a version can't be determined). Storing them verbatim
* corrupts the diff: a package whose version is "NOASSERTION" in the old SBOM
* and "2.0.0" in the new one is reported as an upgrade `NOASSERTION → 2.0.0`,
* which is meaningless. Collapsing the sentinel to undefined lets the diff's
* "both versions known" guard correctly skip it.
*
* (License normalization is handled separately — see PR #32.)
*/
function normalizeSPDXValue(value: unknown): string | undefined {
if (typeof value !== 'string') return undefined;
const trimmed = value.trim();
if (trimmed === '' || trimmed === 'NOASSERTION' || trimmed === 'NONE') return undefined;
return trimmed;
}

function extractSPDXPurl(pkg: Record<string, unknown>): string | undefined {
const refs = pkg.externalRefs;
if (!Array.isArray(refs)) return undefined;
Expand Down
Loading