fix: assure permissions per trust level are properly inherited into open::Options.

Author: Byron

Cargo.lock

@@ -84,7 +84,7 @@ pub(crate) struct EnvironmentOverrides {
 }
 
 impl EnvironmentOverrides {
-    fn from_env() -> Result<Self, crate::permission::env_var::resource::Error> {
+    fn from_env() -> Result<Self, permission::env_var::resource::Error> {
         let mut worktree_dir = None;
         if let Some(path) = std::env::var_os("GIT_WORK_TREE") {
             worktree_dir = PathBuf::from(path).into();
@@ -186,7 +186,7 @@ impl Options {
     }
 
     /// Open a repository at `path` with the options set so far.
-    pub fn open(self, path: impl Into<std::path::PathBuf>) -> Result<ThreadSafeRepository, Error> {
+    pub fn open(self, path: impl Into<PathBuf>) -> Result<ThreadSafeRepository, Error> {
         ThreadSafeRepository::open_opts(path, self)
     }
 }
@@ -197,17 +197,17 @@ impl git_sec::trust::DefaultForLevel for Options {
             git_sec::Trust::Full => Options {
                 object_store_slots: Default::default(),
                 replacement_objects: Default::default(),
-                permissions: Permissions::all(),
+                permissions: Permissions::default_for_level(level),
                 git_dir_trust: git_sec::Trust::Full.into(),
                 filter_config_section: Some(config::section::is_trusted),
                 lossy_config: None,
             },
             git_sec::Trust::Reduced => Options {
                 object_store_slots: git_odb::store::init::Slots::Given(32), // limit resource usage
                 replacement_objects: ReplacementObjects::Disable, // don't be tricked into seeing manufactured objects
-                permissions: Default::default(),
+                permissions: Permissions::default_for_level(level),
                 git_dir_trust: git_sec::Trust::Reduced.into(),
-                filter_config_section: Some(crate::config::section::is_trusted),
+                filter_config_section: Some(config::section::is_trusted),
                 lossy_config: None,
             },
         }
@@ -219,28 +219,28 @@ impl git_sec::trust::DefaultForLevel for Options {
 #[allow(missing_docs)]
 pub enum Error {
     #[error(transparent)]
-    Config(#[from] crate::config::Error),
+    Config(#[from] config::Error),
     #[error(transparent)]
     NotARepository(#[from] git_discover::is_git::Error),
     #[error(transparent)]
     ObjectStoreInitialization(#[from] std::io::Error),
     #[error("The git directory at '{}' is considered unsafe as it's not owned by the current user.", .path.display())]
-    UnsafeGitDir { path: std::path::PathBuf },
+    UnsafeGitDir { path: PathBuf },
     #[error(transparent)]
-    EnvironmentAccessDenied(#[from] crate::permission::env_var::resource::Error),
+    EnvironmentAccessDenied(#[from] permission::env_var::resource::Error),
 }
 
 impl ThreadSafeRepository {
     /// Open a git repository at the given `path`, possibly expanding it to `path/.git` if `path` is a work tree dir.
-    pub fn open(path: impl Into<std::path::PathBuf>) -> Result<Self, Error> {
+    pub fn open(path: impl Into<PathBuf>) -> Result<Self, Error> {
         Self::open_opts(path, Options::default())
     }
 
     /// Open a git repository at the given `path`, possibly expanding it to `path/.git` if `path` is a work tree dir, and use
     /// `options` for fine-grained control.
     ///
     /// Note that you should use [`crate::discover()`] if security should be adjusted by ownership.
-    pub fn open_opts(path: impl Into<std::path::PathBuf>, mut options: Options) -> Result<Self, Error> {
+    pub fn open_opts(path: impl Into<PathBuf>, mut options: Options) -> Result<Self, Error> {
         let (path, kind) = {
             let path = path.into();
             match git_discover::is_git(&path) {
@@ -319,7 +319,7 @@ impl ThreadSafeRepository {
             .map(|cd| git_dir.join(cd));
         let common_dir_ref = common_dir.as_deref().unwrap_or(&git_dir);
 
-        let repo_config = crate::config::cache::StageOne::new(common_dir_ref, git_dir_trust, lossy_config)?;
+        let repo_config = config::cache::StageOne::new(common_dir_ref, git_dir_trust, lossy_config)?;
         let mut refs = {
             let reflog = repo_config.reflog.unwrap_or(git_ref::store::WriteReflog::Disable);
             let object_hash = repo_config.object_hash;
@@ -337,7 +337,7 @@ impl ThreadSafeRepository {
             repo_config,
             common_dir_ref,
             head.as_ref().and_then(|head| head.target.try_name()),
-            filter_config_section.unwrap_or(crate::config::section::is_trusted),
+            filter_config_section.unwrap_or(config::section::is_trusted),
             git_install_dir.as_deref(),
             home.as_deref(),
             env.clone(),