diff --git a/crates/native/src/install/root_record.rs b/crates/native/src/install/root_record.rs index 0ff4d3de..bd4b66be 100644 --- a/crates/native/src/install/root_record.rs +++ b/crates/native/src/install/root_record.rs @@ -14,7 +14,7 @@ use std::collections::HashSet; use std::ffi::OsStr; use std::io::Read; use std::os::unix::ffi::OsStrExt; -use std::os::unix::fs::MetadataExt; +use std::os::unix::fs::{MetadataExt, PermissionsExt}; use std::path::{Component, Path, PathBuf}; /// Largest list read back: an install holds at most 50,000 files (see `tree::files`). @@ -99,6 +99,10 @@ pub(super) fn stage(tree: &Path, app_id: &str, files: &[PathBuf]) -> Result MAX_BYTES { + return Err("the download has too many files for the launcher to track".into()); + } let dest = tree.join(&rel); // The staging tree came from an archive: never write through a symlink it planted. let mut check = tree.to_path_buf(); @@ -108,10 +112,33 @@ pub(super) fn stage(tree: &Path, app_id: &str, files: &[PathBuf]) -> Result = Vec::new(); + let mut dir = tree.to_path_buf(); + let parents = rel.components().count() - 1; + for part in std::iter::once(None).chain(rel.components().take(parents).map(Some)) { + if let Some(part) = part { + dir.push(part); + } + let Ok(meta) = std::fs::symlink_metadata(&dir) else { break }; + let mode = meta.mode(); + if meta.is_dir() && mode & 0o300 != 0o300 { + std::fs::set_permissions(&dir, std::fs::Permissions::from_mode(mode | 0o300)) + .map_err(|e| format!("couldn't record the installed files ({e})"))?; + reopened.push((dir.clone(), meta.permissions())); + } } - std::fs::write(&dest, text).map_err(|e| format!("couldn't record the installed files ({e})"))?; + let written = (|| { + if let Some(dir) = dest.parent() { + std::fs::create_dir_all(dir).map_err(|e| format!("couldn't create {} ({e})", dir.display()))?; + } + std::fs::write(&dest, text).map_err(|e| format!("couldn't record the installed files ({e})")) + })(); + for (dir, permissions) in reopened.into_iter().rev() { + let _ = std::fs::set_permissions(dir, permissions); + } + written?; Ok(rel) } @@ -160,6 +187,11 @@ pub(super) fn owned(prefix: &Path, app_id: &str, owner: u32) -> Result = (0..20_000).map(|i| PathBuf::from(format!("{i}{name}"))).collect(); + assert!(stage(dir.path(), "wordcraft", &files).is_err()); + assert!(!dir.path().join(relative("wordcraft")).exists()); + } + + #[test] + fn a_list_that_leaves_itself_out_is_not_trusted() { + let (dir, prefix) = installed(&["bin/wordcraft"]); + let list = prefix.join(relative("wordcraft")); + std::fs::write(&list, b"").unwrap(); + assert!(owned(&prefix, "wordcraft", me(dir.path())).is_err(), "an empty list"); + std::fs::write(&list, b"bin/wordcraft\n").unwrap(); + assert!(owned(&prefix, "wordcraft", me(dir.path())).is_err(), "a list without itself"); + } }