Skip to content

Commit 9a4f8d5

Browse files
authored
Merge pull request #2826 from theupdateframework/dependabot/pip/dependencies-54f6db96fa
build(deps): bump securesystemslib from 1.2.0 to 1.3.0 in the dependencies group
2 parents 737b41f + ee50fea commit 9a4f8d5

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ disable_error_code = ["attr-defined"]
135135
[[tool.mypy.overrides]]
136136
module = [
137137
"requests.*",
138-
"securesystemslib.*",
139138
]
140139
ignore_missing_imports = "True"
141140

requirements/pinned.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cryptography==44.0.2
1010
# via securesystemslib
1111
pycparser==2.22
1212
# via cffi
13-
securesystemslib==1.2.0
13+
securesystemslib==1.3.0
1414
# via -r requirements/main.txt
1515
urllib3==2.4.0
1616
# via -r requirements/main.txt

tests/test_api.py

+23-20
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
Key,
2323
SecretsHandler,
2424
Signer,
25+
SSlibKey,
2526
)
2627

2728
from tests import utils
@@ -244,11 +245,11 @@ class FailingSigner(Signer):
244245
@classmethod
245246
def from_priv_key_uri(
246247
cls,
247-
priv_key_uri: str,
248-
public_key: Key,
249-
secrets_handler: SecretsHandler | None = None,
248+
_priv_key_uri: str,
249+
_public_key: Key,
250+
_secrets_handler: SecretsHandler | None = None,
250251
) -> Signer:
251-
pass
252+
raise RuntimeError("Not a real signer")
252253

253254
@property
254255
def public_key(self) -> Key:
@@ -469,43 +470,45 @@ def test_signed_verify_delegate(self) -> None:
469470
)
470471

471472
def test_verification_result(self) -> None:
472-
vr = VerificationResult(3, {"a": None}, {"b": None})
473+
key = SSlibKey("", "", "", {"public": ""})
474+
vr = VerificationResult(3, {"a": key}, {"b": key})
473475
self.assertEqual(vr.missing, 2)
474476
self.assertFalse(vr.verified)
475477
self.assertFalse(vr)
476478

477479
# Add a signature
478-
vr.signed["c"] = None
480+
vr.signed["c"] = key
479481
self.assertEqual(vr.missing, 1)
480482
self.assertFalse(vr.verified)
481483
self.assertFalse(vr)
482484

483485
# Add last missing signature
484-
vr.signed["d"] = None
486+
vr.signed["d"] = key
485487
self.assertEqual(vr.missing, 0)
486488
self.assertTrue(vr.verified)
487489
self.assertTrue(vr)
488490

489491
# Add one more signature
490-
vr.signed["e"] = None
492+
vr.signed["e"] = key
491493
self.assertEqual(vr.missing, 0)
492494
self.assertTrue(vr.verified)
493495
self.assertTrue(vr)
494496

495497
def test_root_verification_result(self) -> None:
496-
vr1 = VerificationResult(3, {"a": None}, {"b": None})
497-
vr2 = VerificationResult(1, {"c": None}, {"b": None})
498+
key = SSlibKey("", "", "", {"public": ""})
499+
vr1 = VerificationResult(3, {"a": key}, {"b": key})
500+
vr2 = VerificationResult(1, {"c": key}, {"b": key})
498501

499502
vr = RootVerificationResult(vr1, vr2)
500-
self.assertEqual(vr.signed, {"a": None, "c": None})
501-
self.assertEqual(vr.unsigned, {"b": None})
503+
self.assertEqual(vr.signed, {"a": key, "c": key})
504+
self.assertEqual(vr.unsigned, {"b": key})
502505
self.assertFalse(vr.verified)
503506
self.assertFalse(vr)
504507

505-
vr1.signed["c"] = None
506-
vr1.signed["f"] = None
507-
self.assertEqual(vr.signed, {"a": None, "c": None, "f": None})
508-
self.assertEqual(vr.unsigned, {"b": None})
508+
vr1.signed["c"] = key
509+
vr1.signed["f"] = key
510+
self.assertEqual(vr.signed, {"a": key, "c": key, "f": key})
511+
self.assertEqual(vr.unsigned, {"b": key})
509512
self.assertTrue(vr.verified)
510513
self.assertTrue(vr)
511514

@@ -678,7 +681,7 @@ def test_root_add_key_and_revoke_key(self) -> None:
678681

679682
# Assert that add_key with old argument order will raise an error
680683
with self.assertRaises(ValueError):
681-
root.signed.add_key(Root.type, key)
684+
root.signed.add_key(Root.type, key) # type: ignore [arg-type]
682685

683686
# Add new root key
684687
root.signed.add_key(key, Root.type)
@@ -778,7 +781,7 @@ def test_targets_key_api(self) -> None:
778781

779782
# Assert that add_key with old argument order will raise an error
780783
with self.assertRaises(ValueError):
781-
targets.add_key("role1", key)
784+
targets.add_key(Root.type, key) # type: ignore [arg-type]
782785

783786
# Assert that delegated role "role1" does not contain the new key
784787
self.assertNotIn(key.keyid, targets.delegations.roles["role1"].keyids)
@@ -1178,7 +1181,7 @@ def test_serialization(self) -> None:
11781181
self.assertEqual(metadata.signed, payload)
11791182

11801183
def test_fail_envelope_serialization(self) -> None:
1181-
envelope = SimpleEnvelope(b"foo", "bar", ["baz"])
1184+
envelope = SimpleEnvelope(b"foo", "bar", []) # type: ignore[arg-type]
11821185
with self.assertRaises(SerializationError):
11831186
envelope.to_bytes()
11841187

@@ -1193,7 +1196,7 @@ def test_fail_payload_serialization(self) -> None:
11931196
def test_fail_payload_deserialization(self) -> None:
11941197
payloads = [b"[", b'{"_type": "foo"}']
11951198
for payload in payloads:
1196-
envelope = SimpleEnvelope(payload, "bar", [])
1199+
envelope = SimpleEnvelope(payload, "bar", {})
11971200
with self.assertRaises(DeserializationError):
11981201
envelope.get_signed()
11991202

0 commit comments

Comments
 (0)