Lightweight coding agent that runs in your terminal
Rust
Fix no-reparse directory opens on Windows 10 (#47672)
zm-oai5f371ba30ae4
diff --git a/codex-rs/windows-sandbox-rs/src/no_reparse_dir.rs b/codex-rs/windows-sandbox-rs/src/no_reparse_dir.rsindex da8cb2de0e..cb14621f6b 100644--- a/codex-rs/windows-sandbox-rs/src/no_reparse_dir.rs+++ b/codex-rs/windows-sandbox-rs/src/no_reparse_dir.rs@@ -30,6 +30,7 @@ use windows_sys::Win32::Storage::FileSystem::FILE_ATTRIBUTE_NORMAL;use windows_sys::Win32::Storage::FileSystem::FILE_READ_DATA;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_READ;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_WRITE;+use windows_sys::Win32::Storage::FileSystem::QueryDosDeviceW;use windows_sys::Win32::System::IO::IO_STATUS_BLOCK;use windows_sys::Win32::System::IO::IO_STATUS_BLOCK_0;use windows_sys::Win32::System::Kernel::OBJ_CASE_INSENSITIVE;@@ -120,6 +121,22 @@ pub fn open_directory_no_reparse(share_access: u32,disposition: DirectoryOpenDisposition,) -> Result<OwnedHandle> {+ let mut nt_path = local_directory_nt_path(path)?;+ open_no_reparse(+ /*root_directory*/ 0,+ &mut nt_path,+ desired_access,+ share_access,+ match disposition {+ DirectoryOpenDisposition::OpenExisting => FILE_OPEN,+ DirectoryOpenDisposition::OpenOrCreate => FILE_OPEN_IF,+ },+ FILE_DIRECTORY_FILE,+ )+ .with_context(|| format!("open directory {}", path.display()))+}++fn local_directory_nt_path(path: &Path) -> Result<Vec<u16>> {validate_local_directory_path(path)?;let source_offset = if matches!(path.components().next(),@@ -129,12 +146,28 @@ pub fn open_directory_no_reparse(} else {0};- // NtCreateFile expects an NT namespace path. Convert only the local-disk- // spellings accepted by provisioning, without canonicalizing and following- // the reparse points that OBJ_DONT_REPARSE must reject.+ // Windows 10 also rejects the Object Manager drive-letter link under+ // OBJ_DONT_REPARSE. Resolve that alias only; never canonicalize filesystem+ // components, which must still be checked by NtCreateFile.let source: Vec<u16> = path.as_os_str().encode_wide().collect();- let mut nt_path: Vec<u16> = OsStr::new("\\??\\").encode_wide().collect();- for unit in source.into_iter().skip(source_offset) {+ let drive = [source[source_offset], b':' as u16, 0];+ let mut nt_path = vec![0_u16; 32_768];+ let length =+ unsafe { QueryDosDeviceW(drive.as_ptr(), nt_path.as_mut_ptr(), nt_path.len() as u32) };+ if length == 0 {+ return Err(std::io::Error::last_os_error()).context("resolve directory drive");+ }+ nt_path.truncate(+ nt_path+ .iter()+ .position(|unit| *unit == 0)+ .unwrap_or(length as usize),+ );+ ensure!(+ is_disk_volume(&nt_path),+ "directory drive must resolve directly to a disk volume"+ );+ for unit in source.into_iter().skip(source_offset + 2) {nt_path.push(if unit == b'/' as u16 {b'\\' as u16} else {@@ -142,18 +175,24 @@ pub fn open_directory_no_reparse(});}nt_path.push(0);- open_no_reparse(- /*root_directory*/ 0,- &mut nt_path,- desired_access,- share_access,- match disposition {- DirectoryOpenDisposition::OpenExisting => FILE_OPEN,- DirectoryOpenDisposition::OpenOrCreate => FILE_OPEN_IF,- },- FILE_DIRECTORY_FILE,- )- .with_context(|| format!("open directory {}", path.display()))+ Ok(nt_path)+}++fn is_disk_volume(target: &[u16]) -> bool {+ let Some((prefix, number)) = target.split_at_checked(br"\Device\HarddiskVolume".len()) else {+ return false;+ };+ // Do not pass other devices or volume subpaths to NtCreateFile.+ prefix+ .iter()+ .zip(br"\Device\HarddiskVolume")+ .all(|(&unit, expected)| {+ u8::try_from(unit).is_ok_and(|unit| unit.eq_ignore_ascii_case(expected))+ })+ && !number.is_empty()+ && number+ .iter()+ .all(|unit| (u16::from(b'0')..=u16::from(b'9')).contains(unit))}/// Keeps a directory nonempty, preventing in-place reparse conversion while thediff --git a/codex-rs/windows-sandbox-rs/src/no_reparse_dir_tests.rs b/codex-rs/windows-sandbox-rs/src/no_reparse_dir_tests.rsindex 829552e577..1ff5454def 100644--- a/codex-rs/windows-sandbox-rs/src/no_reparse_dir_tests.rs+++ b/codex-rs/windows-sandbox-rs/src/no_reparse_dir_tests.rs@@ -2,17 +2,23 @@ use std::fs;use std::os::windows::io::OwnedHandle;use std::path::Path;use std::process::Command;+use windows_sys::Win32::Storage::FileSystem::FILE_READ_ATTRIBUTES;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_DELETE;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_READ;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_WRITE;+use windows_sys::Win32::Storage::FileSystem::FILE_TRAVERSE;use windows_sys::Win32::Storage::FileSystem::READ_CONTROL;use windows_sys::Win32::Storage::FileSystem::WRITE_DAC;use anyhow::Result;+use pretty_assertions::assert_eq;use super::DirectoryOpenDisposition;+use super::is_disk_volume;+use super::local_directory_nt_path;use super::open_directory_no_reparse;use super::validate_local_directory_path;+use windows_sys::Win32::Storage::FileSystem::QueryDosDeviceW;fn open_for_acl(path: &Path, disposition: DirectoryOpenDisposition) -> Result<OwnedHandle> {open_directory_no_reparse(@@ -54,6 +60,74 @@ fn creates_and_opens_plain_directory_leaf() -> Result<()> {Ok(())}+#[test]+fn opens_drive_root_without_following_filesystem_reparses() -> Result<()> {+ let temporary = tempfile::tempdir()?;+ let directory = temporary.path().canonicalize()?;+ let root = directory+ .ancestors()+ .last()+ .expect("absolute path has a root");+ // canonicalize gives a verbatim drive path; exercise both supported forms.+ let ordinary = root+ .to_string_lossy()+ .trim_start_matches(r"\\?\")+ .to_owned();+ let drive: Vec<_> = ordinary.encode_utf16().take(2).chain(Some(0)).collect();+ let mut device = vec![0; 32_768];+ if unsafe { QueryDosDeviceW(drive.as_ptr(), device.as_mut_ptr(), device.len() as u32) } == 0 {+ return Err(std::io::Error::last_os_error().into());+ }+ device.truncate(+ device+ .iter()+ .position(|unit| *unit == 0)+ .expect("QueryDosDeviceW returns a NUL-terminated target"),+ );+ assert!(is_disk_volume(&device));+ for path in [root, Path::new(&ordinary)] {+ for suffix in ["", "no-reparse-test"] {+ let mut expected = device.clone();+ expected.extend(format!(r"\{suffix}").encode_utf16());+ expected.push(0);+ assert_eq!(local_directory_nt_path(&path.join(suffix))?, expected);+ }+ drop(open_directory_no_reparse(+ path,+ FILE_READ_ATTRIBUTES | FILE_TRAVERSE,+ FILE_SHARE_READ | FILE_SHARE_WRITE,+ DirectoryOpenDisposition::OpenExisting,+ )?);+ }+ Ok(())+}++#[test]+fn disk_volume_mapping_excludes_other_devices_and_subpaths() {+ for accepted in [+ r"\Device\HarddiskVolume0",+ r"\Device\HarddiskVolume1",+ r"\device\harddiskvolume123",+ ] {+ assert!(is_disk_volume(&accepted.encode_utf16().collect::<Vec<_>>()));+ }+ for rejected in [+ r"\Device\NamedPipe",+ r"\Device\NamedPipe\pipe",+ r"\Device\HarddiskVolume",+ r"\Device\HarddiskVolume1\directory",+ r"\Device\HarddiskVolume1suffix",+ r"\Device\HarddiskVolumeShadowCopy1",+ r"\Device\CdRom0",+ r"\??\C:\directory",+ ] {+ assert!(+ !is_disk_volume(&rejected.encode_utf16().collect::<Vec<_>>()),+ "accepted {rejected}"+ );+ }+}+#[test]fn rejects_final_directory_junction() -> Result<()> {let temporary = tempfile::tempdir()?;