|
5 | 5 | import uuid |
6 | 6 | from unittest.mock import patch |
7 | 7 |
|
| 8 | +import pytest |
8 | 9 | from conftest import make_sbom_ctx |
9 | 10 | from packaging.requirements import Requirement |
10 | 11 | from packaging.version import Version |
@@ -197,14 +198,49 @@ def test_generate_sbom_wheel_version_used_without_purl_override( |
197 | 198 | assert wheel["externalRefs"][0]["referenceLocator"] == ( |
198 | 199 | "pkg:pypi/test-pkg@0.5.5%2Blocal.1" |
199 | 200 | ) |
200 | | - # Upstream still identifies the resolved source release |
201 | 201 | assert upstream["versionInfo"] == "0.5.5" |
202 | 202 | assert upstream["externalRefs"][0]["referenceLocator"] == ( |
203 | 203 | "pkg:pypi/test-pkg@0.5.5" |
204 | 204 | ) |
205 | 205 | _validate_spdx(doc) |
206 | 206 |
|
207 | 207 |
|
| 208 | +@pytest.mark.parametrize( |
| 209 | + ("package_purl", "sbom_type", "expected_wheel"), |
| 210 | + [ |
| 211 | + ({"name": "test-pkg-corp"}, "pypi", "pkg:pypi/test-pkg-corp@0.5.5"), |
| 212 | + ({"type": "generic"}, "pypi", "pkg:generic/test-pkg@0.5.5"), |
| 213 | + ({"namespace": "acme"}, "pypi", "pkg:pypi/acme/test-pkg@0.5.5"), |
| 214 | + ({}, "generic", "pkg:generic/test-pkg@0.5.5"), |
| 215 | + ], |
| 216 | +) |
| 217 | +def test_generate_sbom_upstream_ignores_wheel_purl_overrides( |
| 218 | + tmp_path: pathlib.Path, |
| 219 | + package_purl: dict[str, str], |
| 220 | + sbom_type: str, |
| 221 | + expected_wheel: str, |
| 222 | +) -> None: |
| 223 | + """Wheel-only purl settings must not rewrite the source identity.""" |
| 224 | + ctx = make_sbom_ctx( |
| 225 | + tmp_path, |
| 226 | + sbom_settings=SbomSettings(purl_type=sbom_type), |
| 227 | + package_overrides={"purl": package_purl}, |
| 228 | + ) |
| 229 | + doc = sbom.generate_sbom( |
| 230 | + ctx=ctx, |
| 231 | + req=Requirement("test-pkg==0.5.5"), |
| 232 | + version=Version("0.5.5"), |
| 233 | + ) |
| 234 | + |
| 235 | + wheel, upstream = doc["packages"] |
| 236 | + assert wheel["externalRefs"][0]["referenceLocator"] == expected_wheel |
| 237 | + assert upstream["name"] == "test-pkg" |
| 238 | + assert upstream["externalRefs"][0]["referenceLocator"] == ( |
| 239 | + "pkg:pypi/test-pkg@0.5.5" |
| 240 | + ) |
| 241 | + _validate_spdx(doc) |
| 242 | + |
| 243 | + |
208 | 244 | def test_generate_sbom_purl_version_override_wins_over_wheel_version( |
209 | 245 | tmp_path: pathlib.Path, |
210 | 246 | ) -> None: |
@@ -298,9 +334,9 @@ def test_generate_sbom_purl_field_overrides(tmp_path: pathlib.Path) -> None: |
298 | 334 | assert wheel["externalRefs"][0]["referenceLocator"] == ( |
299 | 335 | "pkg:generic/custom-name@1.0.0" |
300 | 336 | ) |
301 | | - # Field overrides carry through to upstream (without qualifiers) |
| 337 | + # Wheel field overrides must not change the resolved source identity. |
302 | 338 | assert upstream["externalRefs"][0]["referenceLocator"] == ( |
303 | | - "pkg:generic/custom-name@1.0.0" |
| 339 | + "pkg:pypi/test-pkg@1.0.0" |
304 | 340 | ) |
305 | 341 | # Document identity follows the purl name override |
306 | 342 | assert doc["name"] == "custom-name-1.0.0" |
|
0 commit comments