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

Fix secondary root rotation on metadata expiry #115

Merged
merged 6 commits into from
Aug 13, 2024
Merged

Fix secondary root rotation on metadata expiry #115

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
625c541
Add missing includes and reduce test flake
cajun-rat Aug 2, 2024
a674dd0
Reproducer for TOR-3452
cajun-rat Jul 9, 2024
d4f91ff
Fix for TOR-3452
cajun-rat Jul 21, 2024
ac7a761
Add documentation for checkMetaOffline
cajun-rat Jul 21, 2024
f476f21
Remove default ctor for Uptane::Root
cajun-rat Jul 21, 2024
bda0573
Tidy up root rotation logic
cajun-rat Jul 24, 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
9 changes: 8 additions & 1 deletion src/virtual_secondary/managedsecondary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,16 @@ ManagedSecondary::ManagedSecondary(Primary::ManagedSecondaryConfig sconfig_in) :

try {
director_repo_->checkMetaOffline(*storage_);
} catch (const std::exception &e) {
// This is actually safe. We've done enough initialization to get
// director_repo_ into a valid configuration
LOG_INFO << "No valid Director metadata found in storage: " << e.what();
}
try {
image_repo_->checkMetaOffline(*storage_);
} catch (const std::exception &e) {
LOG_INFO << "No valid metadata found in storage.";
// See above ^ image_repo_ is OK
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "OK" is a bit vague. Maybe should just say that it's stale? (Same with the comment above, really.)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. 'OK' hints at a deeper problem with the types of state that DirectorRepository and ImageRepository and get into. After constructing they need someone to call checkMetaOffline() to get them into a state where they can accept updates. If that call throws and exception, then the thing is still in a state where it can receive updates, as long as someone starts by rotating the root metadata. We can/should tidy this up, but I didn't want to make sweeping changes when there was such a small fix available.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty out of the loop by this point but agree that this can definitely be done differently. Up to you but the comments wouldn't hurt.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I'll add some more description to the docs for checkMetaOffline(). I think I've described the bug a few times now, it is probably worth a definitive description

LOG_INFO << "No valid Image metadata found in storage: " << e.what();
}
}

Expand Down