feat(gix-tempfile)!: support shared permissions for parent directories

Temporary files created in shared repositories can require new parent directories. Callers need those directories to honor the repository's sharing policy even when the process umask would make them private. Replace the tuple field of `ContainingDirectory::CreateAllRaceProof` with named `retries` and `shared_repository_permissions` fields, and pass the policy to directory creation in `gix_fs`. Setting the policy to `0` preserves the previous umask behavior. Adapt the existing tempfile tests to the new variant shape.

Byron committed 2 months ago

Commit edea3751 parent 6d016874 files · +39 −9Browse files

Unified · Split

4 files

gix-lock/src/acquire.rs +4 −1
gix-tempfile/src/handle.rs +4 −1
gix-tempfile/src/lib.rs +7 −1
gix-tempfile/tests/tempfile/handle.rs +24 −6

gix-lock/src/acquire.rs+4−1

     match boundary {
         None => (ContainingDirectory::Exists, AutoRemove::Tempfile),
         Some(boundary_directory) => (
-            ContainingDirectory::CreateAllRaceProof(Default::default()),
+            ContainingDirectory::CreateAllRaceProof {
+                retries: Default::default(),
+                shared_repository_permissions: 0,
+            },
             AutoRemove::TempfileAndEmptyParentDirectoriesUntil { boundary_directory },
         ),
     }

gix-tempfile/src/handle.rs+4−1

     fn resolve(self, dir: &Path) -> std::io::Result<&Path> {
         match self {
             ContainingDirectory::Exists => Ok(dir),
-            ContainingDirectory::CreateAllRaceProof(retries) => crate::create_dir::all(dir, retries, 0),
+            ContainingDirectory::CreateAllRaceProof {
+                retries,
+                shared_repository_permissions,
+            } => crate::create_dir::all(dir, retries, shared_repository_permissions),
         }
     }
 }

gix-tempfile/src/lib.rs+7−1

     Exists,
     /// Create the directory recursively with the given number of retries in a way that is somewhat race resistant
     /// depending on the amount of retries.
-    CreateAllRaceProof(create_dir::Retries),
+    CreateAllRaceProof {
+        /// How often to retry directory creation when other processes interfere.
+        retries: create_dir::Retries,
+        /// Git's parsed sharing policy for newly created directories; `0` keeps the umask permissions.
+        /// See [`gix_fs::adjust_shared_repository_permissions()`] for the encoding.
+        shared_repository_permissions: i32,
+    },
 }
 /// A type expressing the ways we cleanup after ourselves to remove resources we created.

gix-tempfile/tests/tempfile/handle.rs+24−6

         let new_filename = target.parent().unwrap().join("file.ext");
         let handle = gix_tempfile::mark_at(
             &target,
-            ContainingDirectory::CreateAllRaceProof(Default::default()),
+            ContainingDirectory::CreateAllRaceProof {
+                retries: Default::default(),
+                shared_repository_permissions: 0,
+            },
             AutoRemove::TempfileAndEmptyParentDirectoriesUntil {
                 boundary_directory: dir.path().into(),
             },
         let filename = dir.path().join(first_dir).join("subdir").join("file.tmp");
         let tempfile = gix_tempfile::mark_at(
             &filename,
-            ContainingDirectory::CreateAllRaceProof(Default::default()),
+            ContainingDirectory::CreateAllRaceProof {
+                retries: Default::default(),
+                shared_repository_permissions: 0,
+            },
             AutoRemove::TempfileAndEmptyParentDirectoriesUntil {
                 boundary_directory: dir.path().into(),
             },
         let new_filename = target.parent().unwrap().join("file.ext");
         let mut file = gix_tempfile::writable_at(
             &target,
-            ContainingDirectory::CreateAllRaceProof(Default::default()),
+            ContainingDirectory::CreateAllRaceProof {
+                retries: Default::default(),
+                shared_repository_permissions: 0,
+            },
             AutoRemove::TempfileAndEmptyParentDirectoriesUntil {
                 boundary_directory: dir.path().into(),
             },
         );
         let handle = gix_tempfile::writable_at(
             &target,
-            ContainingDirectory::CreateAllRaceProof(Default::default()),
+            ContainingDirectory::CreateAllRaceProof {
+                retries: Default::default(),
+                shared_repository_permissions: 0,
+            },
             AutoRemove::TempfileAndEmptyParentDirectoriesUntil {
                 boundary_directory: dir.path().into(),
             },
         let filename = dir.path().join(first_dir).join("subdir").join("file.tmp");
         let tempfile = gix_tempfile::writable_at(
             &filename,
-            ContainingDirectory::CreateAllRaceProof(Default::default()),
+            ContainingDirectory::CreateAllRaceProof {
+                retries: Default::default(),
+                shared_repository_permissions: 0,
+            },
             AutoRemove::TempfileAndEmptyParentDirectoriesUntil {
                 boundary_directory: dir.path().into(),
             },
         {
             let mut writable = gix_tempfile::new(
                 &containing_dir,
-                ContainingDirectory::CreateAllRaceProof(Default::default()),
+                ContainingDirectory::CreateAllRaceProof {
+                    retries: Default::default(),
+                    shared_repository_permissions: 0,
+                },
                 AutoRemove::TempfileAndEmptyParentDirectoriesUntil {
                     boundary_directory: dir.path().into(),
                 },