From 35549033124d31f72c4a97971576eb452f50d02a Mon Sep 17 00:00:00 2001 From: Timothy Wayne Gregg Date: Sun, 25 Oct 2026 19:53:44 -0400 Subject: [PATCH] Keep namespaced CycloneDX packages distinct from unscoped components --- SHA256SUMS | 2 +- docs/REFERENCE.md | 4 ++++ sharp_rsvg_rce_check.py | 5 ++++- src/adapters.py | 5 ++++- test_adapters.py | 11 +++++++++++ 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/SHA256SUMS b/SHA256SUMS index b345ad0..4ec9a4c 100644 --- a/SHA256SUMS +++ b/SHA256SUMS @@ -1,2 +1,2 @@ -8e1f8aa20f18eff0ab83c4d3a30b96923107215b44ea3ed243ce0c0b8c06e5ad sharp_rsvg_rce_check.py +694c7078442ca6a7fae1da810adecf1dec28673b5b5d43aa41132e57f0903273 sharp_rsvg_rce_check.py dbcee01397d62d0017fea9319fcb8d59a36b5bf0dfe16556f890cca498c848f6 rules/snapshot.json diff --git a/docs/REFERENCE.md b/docs/REFERENCE.md index 3fa437a..3bed7ab 100644 --- a/docs/REFERENCE.md +++ b/docs/REFERENCE.md @@ -126,3 +126,7 @@ Format provenance reviewed 2026-10-25: [Linux ELF header/program-header layouts] The Linux Foundation gABI pages were access-denied; no access restriction was bypassed. Advisory thresholds, rule date and native affected-range uncertainty are unchanged. Edit `src/adapters.py` and rebuild with `python tools/build.py`. + +CycloneDX component namespaces (`group`) must be text; a nonempty namespace is +not treated as an unscoped Sharp/librsvg identity. Nested components continue to +be traversed independently. Unsupported identity remains unknown coverage. diff --git a/sharp_rsvg_rce_check.py b/sharp_rsvg_rce_check.py index e99ca9d..4887eeb 100644 --- a/sharp_rsvg_rce_check.py +++ b/sharp_rsvg_rce_check.py @@ -733,7 +733,10 @@ def metadata_results(path, root, mode, prefix): raise ContractError("Invalid or excessive SBOM components") if "name" in item and not isinstance(item["name"], str): raise ContractError("SBOM component name must be text") - if item.get("name") in {"sharp", "librsvg"}: + group = item.get("group", "") + if not isinstance(group,str): + raise ContractError("CycloneDX component namespace must be text") + if not group and item.get("name") in {"sharp", "librsvg"}: selected.append(("Sharp" if item["name"] == "sharp" else "librsvg", item.get("version"), False)) if "components" in item: pending.append(item["components"]) diff --git a/src/adapters.py b/src/adapters.py index 0e93c2a..c7f7c49 100644 --- a/src/adapters.py +++ b/src/adapters.py @@ -156,7 +156,10 @@ def metadata_results(path, root, mode, prefix): raise ContractError("Invalid or excessive SBOM components") if "name" in item and not isinstance(item["name"], str): raise ContractError("SBOM component name must be text") - if item.get("name") in {"sharp", "librsvg"}: + group = item.get("group", "") + if not isinstance(group,str): + raise ContractError("CycloneDX component namespace must be text") + if not group and item.get("name") in {"sharp", "librsvg"}: selected.append(("Sharp" if item["name"] == "sharp" else "librsvg", item.get("version"), False)) if "components" in item: pending.append(item["components"]) diff --git a/test_adapters.py b/test_adapters.py index e915fe1..05a2e9a 100644 --- a/test_adapters.py +++ b/test_adapters.py @@ -34,6 +34,17 @@ def cli(self, *args): code = c.main(list(args)) return code, out.getvalue(), err.getvalue() + def test_cyclonedx_namespace_does_not_become_unscoped_package(self): + with tempfile.TemporaryDirectory() as directory: + path=Path(directory)/"bom.json" + data=dict(bomFormat="CycloneDX",specVersion="1.6",components=[dict(group="@vendor",name="sharp",version="0.35.4",components=[dict(name="sharp",version="0.35.5")])]) + path.write_text(json.dumps(data),encoding="utf-8") + rows=c.metadata_results(path,Path(directory),"sbom","subject") + self.assertEqual(["0.35.5"],[row["component"]["version"] for row in rows]) + data["components"][0]["group"]=[] + path.write_text(json.dumps(data),encoding="utf-8") + with self.assertRaises(c.ContractError):c.metadata_results(path,Path(directory),"sbom","subject") + def test_arrow_return_regex_body_is_opaque(self): tokens = c._js_tokens("const pattern = () => /const image = require('sharp'); image(input)/;") self.assertIn("@regex", [value for value, _ in tokens])