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
27 changes: 27 additions & 0 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,33 @@ def test_fail_payload_deserialization(self) -> None:
with self.assertRaises(DeserializationError):
envelope.get_signed()

def test_fail_invalid_payload_content_deserialization(self) -> None:
"""Payload has a known role type but its content is not valid."""
valid = {
"_type": "timestamp",
"version": 1,
"spec_version": "1.0.31",
"expires": "2030-01-01T00:00:00Z",
"meta": {"snapshot.json": {"version": 1}},
}
invalid_payloads = [
{"_type": "root"}, # required fields are missing
{**valid, "version": "1"}, # wrong type
{**valid, "version": 0}, # invalid value
{**valid, "expires": "tomorrow"}, # invalid date
]
for payload in invalid_payloads:
envelope = SimpleEnvelope(json.dumps(payload).encode(), "bar", {})
with (
self.subTest(payload=payload),
self.assertRaises(DeserializationError),
):
envelope.get_signed()

# The same payload, with valid content, deserializes
envelope = SimpleEnvelope(json.dumps(valid).encode(), "bar", {})
self.assertIsInstance(envelope.get_signed(), Timestamp)

def test_verify_delegate(self) -> None:
"""Basic verification test.

Expand Down
4 changes: 3 additions & 1 deletion tuf/api/dsse.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ def get_signed(self) -> T:
else:
raise ValueError(f'unrecognized role type "{_type}"')

signed = inner_cls.from_dict(payload_dict)

except Exception as e:
raise DeserializationError from e

return cast("T", inner_cls.from_dict(payload_dict))
return cast("T", signed)
Loading