Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Prevent log permission repair from changing symlink targets (#4611)
Worktrunk Bot793237d3e6bb
diff --git a/src/utils.rs b/src/utils.rsindex da48fb209..44b9c0af8 100644--- a/src/utils.rs+++ b/src/utils.rs@@ -175,9 +175,10 @@ pub fn write_new_atomically(path: &Path, content: &str) -> io::Result<()> {////// `relative_path` names a file within `log_dir`. On Unix, new directories/// are owner-only; every directory from the file's parent through `log_dir`-/// is restricted to 0700 and an existing regular file to 0600. Log-file-/// symlinks and special files are left alone: repair must not change a file's-/// symlink target or block on a FIFO even without a log write.+/// is restricted to 0700 and an existing regular file to 0600. Symlinked+/// directories are rejected so repair cannot change permissions outside the+/// log tree. Log-file symlinks and special files are left alone: repair must+/// not change a file's symlink target or block on a FIFO without a log write.pub fn prepare_log_file(log_dir: &Path, relative_path: &Path) -> io::Result<std::path::PathBuf> {let path = log_dir.join(relative_path);let parent = path@@ -189,11 +190,23 @@ pub fn prepare_log_file(log_dir: &Path, relative_path: &Path) -> io::Result<std:{use std::os::unix::fs::{DirBuilderExt, PermissionsExt};directory.mode(0o700);- directory.create(parent)?;+ directory.create(log_dir)?;for ancestor in parent.ancestors().take_while(|dir| dir.starts_with(log_dir))+ .collect::<Vec<_>>()+ .into_iter()+ .rev(){+ if ancestor != log_dir {+ directory.create(ancestor)?;+ }+ if !std::fs::symlink_metadata(ancestor)?.file_type().is_dir() {+ return Err(io::Error::new(+ io::ErrorKind::InvalidInput,+ format!("Log directory is not a directory: {}", ancestor.display()),+ ));+ }std::fs::set_permissions(ancestor, std::fs::Permissions::from_mode(0o700))?;}if std::fs::symlink_metadata(&path).is_ok_and(|metadata| metadata.file_type().is_file()) {@@ -265,6 +278,35 @@ fn write_atomically_with(path: &Path, content: &str, overwrite: bool) -> io::Resmod tests {use super::*;+ #[cfg(unix)]+ #[test]+ fn prepare_log_file_does_not_chmod_symlinked_directory() {+ use std::os::unix::fs::{PermissionsExt, symlink};++ let dir = tempfile::tempdir().unwrap();+ let outside = dir.path().join("outside");+ std::fs::create_dir(&outside).unwrap();+ std::fs::set_permissions(&outside, std::fs::Permissions::from_mode(0o755)).unwrap();+ let log_dir = dir.path().join("logs");+ symlink(&outside, &log_dir).unwrap();++ assert!(prepare_log_file(&log_dir, Path::new("commands.jsonl")).is_err());+ assert_eq!(+ std::fs::metadata(&outside).unwrap().permissions().mode() & 0o777,+ 0o755+ );++ let real_log_dir = dir.path().join("real-logs");+ std::fs::create_dir(&real_log_dir).unwrap();+ symlink(&outside, real_log_dir.join("nested")).unwrap();+ assert!(prepare_log_file(&real_log_dir, Path::new("nested/hook.log")).is_err());+ assert!(!outside.join("hook.log").exists());+ assert_eq!(+ std::fs::metadata(&outside).unwrap().permissions().mode() & 0o777,+ 0o755+ );+ }+#[test]fn test_write_atomically_creates_then_replaces() {let dir = tempfile::tempdir().unwrap();