From f9b5fc49b123cb4db3941ee2ae9b891f5262deef Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 3 Sep 2023 17:10:06 +0300 Subject: feat(tvix/store/fuse): allow listing This provides an additional configuration flag to the tvix-store mount subcommand, and logic in the fuse module to request listing for the root of the mountpoint. Change-Id: I05a8bc11f7991b574696f27a30afe0f4e718a58c Reviewed-on: https://cl.tvl.fyi/c/depot/+/9217 Autosubmit: flokli Reviewed-by: adisbladis Tested-by: BuildkiteCI --- tvix/store/src/fuse/tests.rs | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'tvix/store/src/fuse/tests.rs') diff --git a/tvix/store/src/fuse/tests.rs b/tvix/store/src/fuse/tests.rs index e5e36579b6c2..2c99f75471a5 100644 --- a/tvix/store/src/fuse/tests.rs +++ b/tvix/store/src/fuse/tests.rs @@ -25,6 +25,17 @@ fn setup_and_mount, F>( mountpoint: P, setup_fn: F, ) -> Result +where + F: Fn(Arc, Arc, Arc), +{ + setup_and_mount_with_listing(mountpoint, setup_fn, false) +} + +fn setup_and_mount_with_listing, F>( + mountpoint: P, + setup_fn: F, + list_root: bool, +) -> Result where F: Fn(Arc, Arc, Arc), { @@ -38,7 +49,12 @@ where path_info_service.clone(), ); - let fs = FUSE::new(blob_service, directory_service, path_info_service); + let fs = FUSE::new( + blob_service, + directory_service, + path_info_service, + list_root, + ); fuser::spawn_mount2(fs, mountpoint, &[]) } @@ -280,6 +296,34 @@ fn root() { fuser_session.join() } +/// Ensure listing the root is allowed if configured explicitly +#[test] +fn root_with_listing() { + // https://plume.benboeckel.net/~/JustAnotherBlog/skipping-tests-in-rust + if !std::path::Path::new("/dev/fuse").exists() { + eprintln!("skipping test"); + return; + } + let tmpdir = TempDir::new().unwrap(); + + let fuser_session = + setup_and_mount_with_listing(tmpdir.path(), populate_blob_a, true).expect("must succeed"); + + { + // read_dir succeeds, but getting the first element will fail. + let mut it = fs::read_dir(tmpdir).expect("must succeed"); + + let e = it.next().expect("must be some").expect("must succeed"); + + let metadata = e.metadata().expect("must succeed"); + assert!(metadata.is_file()); + assert!(metadata.permissions().readonly()); + assert_eq!(fixtures::BLOB_A.len() as u64, metadata.len()); + } + + fuser_session.join() +} + /// Ensure we can stat a file at the root #[test] fn stat_file_at_root() { -- cgit 1.4.1