Skip to content

_impl: catch another _ultranormalize_dist_filename error case #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2024
Merged

_impl: catch another _ultranormalize_dist_filename error case #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083998d
_impl: catch another _ultranormalize_dist_filename error case
woodruffw Jul 15, 2024
aed7a5f
tests
woodruffw Jul 15, 2024
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
6 changes: 5 additions & 1 deletion src/pypi_attestations/_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,11 @@ def verify(
except ValueError as e:
raise VerificationError(f"invalid subject: {str(e)}")

normalized = _ultranormalize_dist_filename(dist.name)
try:
normalized = _ultranormalize_dist_filename(dist.name)
except ValueError as e:
raise VerificationError(f"invalid distribution name: {str(e)}")

if subject_name != normalized:
raise VerificationError(
f"subject does not match distribution name: {subject_name} != {normalized}"
Expand Down
35 changes: 35 additions & 0 deletions test/test_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,41 @@ def test_verify_subject_invalid_name(self) -> None:
with pytest.raises(impl.VerificationError, match="invalid subject: Invalid wheel filename"):
attestation.verify(verifier, pol, artifact_path)

def test_verify_distribution_invalid_name(self, tmp_path: Path) -> None:
statement = (
_StatementBuilder() # noqa: SLF001
.subjects(
[
_Subject(
name=artifact_path.name,
digest=_DigestSet(root={"sha256": "abcd"}),
),
]
)
.predicate_type("foo")
.build()
._inner.model_dump_json()
)

verifier = pretend.stub(
verify_dsse=pretend.call_recorder(
lambda bundle, policy: (
"application/vnd.in-toto+json",
statement.encode(),
)
)
)
pol = pretend.stub()

attestation = impl.Attestation.model_validate_json(attestation_path.read_text())
bad_artifact = tmp_path / "bad.whl"
bad_artifact.write_bytes(artifact_path.read_bytes())

with pytest.raises(
impl.VerificationError, match="invalid distribution name: Invalid wheel filename"
):
attestation.verify(verifier, pol, bad_artifact)

def test_verify_unknown_attestation_type(self) -> None:
statement = (
_StatementBuilder() # noqa: SLF001
Expand Down