diff --git a/crates/lensdb/src/lib.rs b/crates/lensdb/src/lib.rs index 91f6723c1c..e34e07f862 100644 --- a/crates/lensdb/src/lib.rs +++ b/crates/lensdb/src/lib.rs @@ -280,7 +280,11 @@ fn exif_focal_range(exif: &[String]) -> Option<(f64, f64)> { fn read_capped(path: &Path) -> Result { use std::io::Read; let io = |e: std::io::Error| Error::Io(e.to_string()); - // the opened file is checked, not the pathname: a link or FIFO swapped in after a pathname check is refused too + // the pathname is checked before opening (opening a FIFO for reading blocks until a writer appears), then the + // opened file again: a link or FIFO swapped in after the pathname check is refused too + if !std::fs::metadata(path).map_err(io)?.is_file() { + return Err(Error::Io(format!("{}: not a regular file", path.display()))); + } let file = std::fs::File::open(path).map_err(io)?; let meta = file.metadata().map_err(io)?; if !meta.is_file() { diff --git a/crates/lensdb/src/tests.rs b/crates/lensdb/src/tests.rs index e535330a6e..9a25b53b1e 100644 --- a/crates/lensdb/src/tests.rs +++ b/crates/lensdb/src/tests.rs @@ -417,3 +417,21 @@ fn load_dir_refuses_a_non_regular_xml_entry() { assert!(db.is_empty()); assert_eq!(errs.len(), 1, "{errs:?}"); } + +/// A FIFO named `*.xml` is refused without opening it: opening a FIFO for reading blocks until a writer appears. +#[cfg(unix)] +#[test] +fn load_dir_refuses_a_fifo_without_blocking() { + let dir = std::env::temp_dir().join(format!("lensdb-test-fifo-{}", std::process::id())); + std::fs::create_dir(&dir).unwrap(); + let fifo = dir.join("f.xml"); + let made = std::process::Command::new("mkfifo").arg(&fifo).status().is_ok_and(|s| s.success()); + if !made { + std::fs::remove_dir_all(&dir).unwrap(); + return; + } + let (db, errs) = LensDb::load_dir(&dir).unwrap(); + std::fs::remove_dir_all(&dir).unwrap(); + assert!(db.is_empty()); + assert_eq!(errs.len(), 1, "{errs:?}"); +}