Skip to content

Commit 1d166f0

Browse files
author
Jussi Kukkonen
authored
Merge pull request #1876 from jku/more-details-on-verify-failure
Logging and error message improvements
2 parents d9f2d9d + fc1558b commit 1d166f0

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

tuf/api/metadata.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ def verify_signature(
742742
sslib_exceptions.UnsupportedAlgorithmError,
743743
SerializationError,
744744
) as e:
745+
# Log unexpected failure, but continue as if there was no signature
746+
logger.info("Key %s failed to verify sig: %s", self.keyid, str(e))
745747
raise exceptions.UnsignedMetadataError(
746748
f"Failed to verify {self.keyid} signature"
747749
) from e

tuf/api/serialization/json.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def deserialize(self, raw_data: bytes) -> Metadata:
3737
metadata_obj = Metadata.from_dict(json_dict)
3838

3939
except Exception as e:
40-
raise DeserializationError from e
40+
raise DeserializationError("Failed to deserialize JSON") from e
4141

4242
return metadata_obj
4343

@@ -82,7 +82,7 @@ def serialize(self, metadata_obj: Metadata) -> bytes:
8282
raise ValueError("Metadata cannot be validated!") from e
8383

8484
except Exception as e:
85-
raise SerializationError from e
85+
raise SerializationError("Failed to serialize JSON") from e
8686

8787
return json_bytes
8888

0 commit comments

Comments
 (0)