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
2 changes: 1 addition & 1 deletion SHA256SUMS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
8e1f8aa20f18eff0ab83c4d3a30b96923107215b44ea3ed243ce0c0b8c06e5ad sharp_rsvg_rce_check.py
694c7078442ca6a7fae1da810adecf1dec28673b5b5d43aa41132e57f0903273 sharp_rsvg_rce_check.py
dbcee01397d62d0017fea9319fcb8d59a36b5bf0dfe16556f890cca498c848f6 rules/snapshot.json
4 changes: 4 additions & 0 deletions docs/REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
5 changes: 4 additions & 1 deletion sharp_rsvg_rce_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
5 changes: 4 additions & 1 deletion src/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
11 changes: 11 additions & 0 deletions test_adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
Loading