min
/
lanzaboote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tool: check file hashes before copying 

To minimize writes to the ESP but still find necessary changes, compare
the hashes of the files on the ESP with the "expected" hashes. Only copy
and overwrite already existing files if the hashes don't match. This
ensures a working-as-expected state on the ESP as opposed to previously
where already existing files were just ignored.
This commit is contained in:
nikstur 2023-02-20 00:41:06 +01:00
parent 06b9cdc69e
commit 362205c2ec
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rust/tool/src/install.rs
View File

@ -15,7 +15,7 @@ use crate::os_release::OsRelease;
use crate::pe; use crate::pe;
use crate::signature::KeyPair; use crate::signature::KeyPair;
use crate::systemd::SystemdVersion; use crate::systemd::SystemdVersion;
use crate::utils::SecureTempDirExt; use crate::utils::{file_hash, SecureTempDirExt};
pub struct Installer { pub struct Installer {
gc_roots: Roots, gc_roots: Roots,
@ -381,14 +381,13 @@ impl GenerationArtifacts {
/// Install a PE file. The PE gets signed in the process. /// Install a PE file. The PE gets signed in the process.
/// ///
/// The file is only signed and copied if it doesn't exist at the destination /// The file is only signed and copied if
/// (1) it doesn't exist at the destination or,
/// (2) the hash of the file at the destination does not match the hash of the source file.
fn install_signed(key_pair: &KeyPair, from: &Path, to: &Path) -> Result<()> { fn install_signed(key_pair: &KeyPair, from: &Path, to: &Path) -> Result<()> {
if to.exists() { if !to.exists() || file_hash(from)? != file_hash(to)? {
println!("{} already exists, skipping...", to.display());
} else {
force_install_signed(key_pair, from, to)?; force_install_signed(key_pair, from, to)?;
} }
Ok(()) Ok(())
} }
@ -414,22 +413,29 @@ fn force_install_signed(key_pair: &KeyPair, from: &Path, to: &Path) -> Result<()
/// Install an arbitrary file. /// Install an arbitrary file.
/// ///
/// The file is only copied if it doesn't exist at the destination. /// The file is only copied if
/// (1) it doesn't exist at the destination or,
/// (2) the hash of the file at the destination does not match the hash of the source file.
fn install(from: &Path, to: &Path) -> Result<()> {
if !to.exists() || file_hash(from)? != file_hash(to)? {
force_install(from, to)?;
}
Ok(())
}
/// Forcibly install an arbitrary file.
///
/// If the file already exists at the destination, it is overwritten.
/// ///
/// This function is only designed to copy files to the ESP. It sets the permission bits of the /// This function is only designed to copy files to the ESP. It sets the permission bits of the
/// file at the destination to 0o755, the expected permissions for a vfat ESP. This is useful for /// file at the destination to 0o755, the expected permissions for a vfat ESP. This is useful for
/// producing file systems trees which can then be converted to a file system image. /// producing file systems trees which can then be converted to a file system image.
fn install(from: &Path, to: &Path) -> Result<()> { fn force_install(from: &Path, to: &Path) -> Result<()> {
if to.exists() { println!("Installing {}...", to.display());
println!("{} already exists, skipping...", to.display()); ensure_parent_dir(to);
} else { atomic_copy(from, to)?;
println!("Installing {}...", to.display()); set_permission_bits(to, 0o755)
ensure_parent_dir(to); .with_context(|| format!("Failed to set permission bits to 0o755 on file: {to:?}"))?;
atomic_copy(from, to)?;
set_permission_bits(to, 0o755)
.with_context(|| format!("Failed to set permission bits to 0o755 on file: {to:?}"))?;
}
Ok(()) Ok(())
} }