Skip to content
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

Jump to bottom

tests: Refactor key rotation in simulator #1766

Merged
merged 1 commit into from
Feb 3, 2022
+16 −24
Merged

tests: Refactor key rotation in simulator #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions tests/repository_simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,15 @@ def add_signer(self, role: str, signer: SSlibSigner) -> None:
self.signers[role] = {}
self.signers[role][signer.key_dict["keyid"]] = signer

def rotate_keys(self, role: str) -> None:
"""remove all keys for role, then add threshold of new keys"""
self.root.roles[role].keyids.clear()
self.signers[role].clear()
for _ in range(0, self.root.roles[role].threshold):
key, signer = self.create_key()
self.root.add_key(role, key)
self.add_signer(role, signer)

def _initialize(self) -> None:
"""Setup a minimal valid repository."""

Expand Down
31 changes: 7 additions & 24 deletions tests/test_updater_top_level_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,12 +360,8 @@ def test_new_timestamp_fast_foward_recovery(self) -> None:
self._run_refresh()
self._assert_version_equals(Timestamp.type, 99999)

# repo add new timestamp keys and recovers the timestamp version
self.sim.root.roles[Timestamp.type].keyids.clear()
self.sim.signers[Timestamp.type].clear()
key, signer = self.sim.create_key()
self.sim.root.add_key(Timestamp.type, key)
self.sim.add_signer(Timestamp.type, signer)
# repository rotates timestamp keys, rolls back timestamp version
self.sim.rotate_keys(Timestamp.type)
self.sim.root.version += 1
self.sim.publish_root()
self.sim.timestamp.version = 1
Expand Down Expand Up @@ -448,17 +444,9 @@ def test_new_snapshot_fast_foward_recovery(self) -> None:
self._run_refresh()
self._assert_version_equals(Snapshot.type, 99999)

# repo add new snapshot and timestamp keys and recovers snapshot version
self.sim.root.roles[Snapshot.type].keyids.clear()
self.sim.signers[Snapshot.type].clear()
self.sim.root.roles[Timestamp.type].keyids.clear()
self.sim.signers[Timestamp.type].clear()
snapshot_key, snapshot_signer = self.sim.create_key()
self.sim.root.add_key(Snapshot.type, snapshot_key)
self.sim.add_signer(Snapshot.type, snapshot_signer)
timestamp_key, timestamp_signer = self.sim.create_key()
self.sim.root.add_key(Timestamp.type, timestamp_key)
self.sim.add_signer(Timestamp.type, timestamp_signer)
# repository rotates snapshot & timestamp keys, rolls back snapshot
self.sim.rotate_keys(Snapshot.type)
self.sim.rotate_keys(Timestamp.type)
self.sim.root.version += 1
self.sim.publish_root()

Expand Down Expand Up @@ -562,13 +550,8 @@ def test_new_targets_fast_forward_recovery(self) -> None:
self._run_refresh()
self._assert_version_equals(Targets.type, 99999)

# repo add new snapshot keys and recovers the targets version
self.sim.root.roles[Snapshot.type].keyids.clear()
self.sim.signers[Snapshot.type].clear()
snapshot_key, snapshot_signer = self.sim.create_key()
self.sim.root.add_key(Snapshot.type, snapshot_key)
self.sim.add_signer(Snapshot.type, snapshot_signer)

# repository rotates snapshot keys, rolls back targets version
self.sim.rotate_keys(Snapshot.type)
self.sim.root.version += 1
self.sim.publish_root()

Expand Down