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

[TUF] Retry executable checks and directory renames on update download #1556

Merged
merged 2 commits into from
Jan 23, 2024
Merged

[TUF] Retry executable checks and directory renames on update download #1556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4493ba2
Retry executable checks and directory renames on update download
RebeccaMahany Jan 22, 2024
fc8b886
Fix typo in comment
RebeccaMahany Jan 22, 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
20 changes: 14 additions & 6 deletions ee/tuf/library_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,24 @@ func (ulm *updateLibraryManager) moveVerifiedUpdate(binary autoupdatableBinary,
return fmt.Errorf("could not patch executable: %w", err)
}

// Validate the executable
if err := autoupdate.CheckExecutable(context.TODO(), executableLocation(stagedVersionedDirectory, binary), "--version"); err != nil {
return fmt.Errorf("could not verify executable: %w", err)
// Validate the executable -- the executable check will occasionally time out, especially on Windows,
// and we aren't in a rush here, so we retry a couple times.
if err := backoff.WaitFor(func() error {
return autoupdate.CheckExecutable(context.TODO(), executableLocation(stagedVersionedDirectory, binary), "--version")
}, 45*time.Second, 15*time.Second); err != nil {
return fmt.Errorf("could not verify executable after retries: %w", err)
}

// All good! Shelve it in the library under its version
// All good! Shelve it in the library under its version. We also perform some retries
// here for Windows, since sometimes Windows will think the binary is still in use and
// will refuse to move it.
newUpdateDirectory := filepath.Join(updatesDirectory(binary, ulm.baseDir), targetVersion)
if err := os.Rename(stagedVersionedDirectory, newUpdateDirectory); err != nil {
return fmt.Errorf("could not move staged target %s from %s to %s: %w", targetFilename, stagedVersionedDirectory, newUpdateDirectory, err)
if err := backoff.WaitFor(func() error {
return os.Rename(stagedVersionedDirectory, newUpdateDirectory)
}, 6*time.Second, 2*time.Second); err != nil {
return fmt.Errorf("could not move staged target %s from %s to %s after retries: %w", targetFilename, stagedVersionedDirectory, newUpdateDirectory, err)
}

// Need rwxr-xr-x so that the desktop (running as user) can execute the downloaded binary too
if err := os.Chmod(newUpdateDirectory, 0755); err != nil {
return fmt.Errorf("could not chmod %s: %w", newUpdateDirectory, err)
Expand Down
Loading