Merge pull request #568 from AOSC-Dev/no-set-permission

No set permission

Author: eatradish

oma-fetch/src/download.rs

@@ -1,9 +1,7 @@
 use crate::{CompressFile, DownloadSource, Event, checksum::ChecksumValidator, send_request};
 use std::{
     borrow::Cow,
-    fs::Permissions,
     io::{self, SeekFrom},
-    os::unix::fs::PermissionsExt,
     path::Path,
     time::Duration,
 };
@@ -46,7 +44,6 @@ pub(crate) struct SingleDownloader<'a> {
     msg: Option<Cow<'static, str>>,
     download_list_index: usize,
     file_type: CompressFile,
-    set_permission: Option<u32>,
     timeout: Duration,
 }
 
@@ -106,7 +103,6 @@ impl<'a> SingleDownloader<'a> {
         msg: Option<Cow<'static, str>>,
         download_list_index: usize,
         file_type: CompressFile,
-        set_permission: Option<u32>,
         timeout: Duration,
     ) -> Result<SingleDownloader<'a>, BuilderError> {
         if entry.source.is_empty() {
@@ -123,7 +119,6 @@ impl<'a> SingleDownloader<'a> {
             msg,
             download_list_index,
             file_type,
-            set_permission,
             timeout,
         })
     }
@@ -258,8 +253,6 @@ impl<'a> SingleDownloader<'a> {
                 self.entry.filename
             );
 
-            self.set_permission_with_path(&file).await?;
-
             if let Some(hash) = &self.entry.hash {
                 trace!("Hash {} exists for the existing file.", hash);
 
@@ -423,8 +416,6 @@ impl<'a> SingleDownloader<'a> {
                 return Err(SingleDownloadError::Create { source: e });
             }
 
-            self.set_permission(&f).await?;
-
             (f, hash.as_ref().map(|hash| hash.get_validator()))
         } else if let Some((dest, validator)) = dest.zip(validator) {
             callback(Event::ProgressInc {
@@ -459,8 +450,6 @@ impl<'a> SingleDownloader<'a> {
                 return Err(SingleDownloadError::Create { source: e });
             }
 
-            self.set_permission(&f).await?;
-
             (f, hash.as_ref().map(|hash| hash.get_validator()))
         };
 
@@ -558,35 +547,6 @@ impl<'a> SingleDownloader<'a> {
         Ok(true)
     }
 
-    async fn set_permission(&self, f: &File) -> Result<(), SingleDownloadError> {
-        if let Some(mode) = self.set_permission {
-            trace!(
-                "Setting permission for file {} to {:#o} ...",
-                self.entry.filename, mode
-            );
-            f.set_permissions(Permissions::from_mode(mode))
-                .await
-                .context(SetPermissionSnafu)?;
-        }
-
-        Ok(())
-    }
-
-    async fn set_permission_with_path(&self, path: &Path) -> Result<(), SingleDownloadError> {
-        if let Some(mode) = self.set_permission {
-            trace!(
-                "Setting permission for file {} to {:#o} ...",
-                self.entry.filename, mode
-            );
-
-            fs::set_permissions(path, Permissions::from_mode(mode))
-                .await
-                .context(SetPermissionSnafu)?;
-        }
-
-        Ok(())
-    }
-
     fn build_request_with_basic_auth(
         &self,
         url: &str,
@@ -665,8 +625,6 @@ impl<'a> SingleDownloader<'a> {
             .await
             .context(CreateSnafu)?;
 
-        self.set_permission(&to).await?;
-
         let reader: &mut (dyn AsyncRead + Unpin + Send) = match self.file_type {
             CompressFile::Xz => &mut XzDecoder::new(BufReader::new(from)),
             CompressFile::Gzip => &mut GzipDecoder::new(BufReader::new(from)),

oma-fetch/src/lib.rs

@@ -194,7 +194,6 @@ pub struct DownloadManager<'a> {
     retry_times: usize,
     #[builder(default)]
     total_size: u64,
-    set_permission: Option<u32>,
     #[builder(default = Duration::from_secs(15))]
     timeout: Duration,
 }
@@ -239,7 +238,6 @@ impl DownloadManager<'_> {
                 .progress((i + 1, self.download_list.len()))
                 .retry_times(self.retry_times)
                 .file_type(c.file_type)
-                .maybe_set_permission(self.set_permission)
                 .timeout(self.timeout)
                 .build()?;
 

oma-pm/src/commit.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fs::create_dir_all, os::unix::fs::PermissionsExt, path::Path};
+use std::{borrow::Cow, fs::create_dir_all, path::Path};
 
 use apt_auth_config::AuthConfig;
 use chrono::Local;
@@ -79,9 +79,6 @@ impl<'a> DoInstall<'a> {
         create_dir_all(path)
             .map_err(|e| OmaAptError::FailedOperateDirOrFile(path.display().to_string(), e))?;
 
-        std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o755))
-            .map_err(|e| OmaAptError::FailedOperateDirOrFile(path.display().to_string(), e))?;
-
         self.apt.get_or_init_async_runtime()?.block_on(async {
             if let Some(conn) = self.apt.conn.get() {
                 change_status(conn, "Downloading").await.ok();

oma-refresh/src/db.rs

@@ -1,7 +1,6 @@
 use std::{
     borrow::Cow,
-    fs::Permissions,
-    os::{fd::OwnedFd, unix::fs::PermissionsExt},
+    os::fd::OwnedFd,
     path::{Path, PathBuf},
 };
 
@@ -259,17 +258,6 @@ impl<'a> OmaRefresh<'a> {
             })?;
         }
 
-        debug!(
-            "Setting permission for {} as 0755",
-            self.download_dir.display()
-        );
-
-        fs::set_permissions(&self.download_dir, Permissions::from_mode(0o755))
-            .await
-            .map_err(|e| {
-                RefreshError::FailedToOperateDirOrFile(self.download_dir.display().to_string(), e)
-            })?;
-
         let download_dir: Box<Path> = Box::from(self.download_dir.as_path());
 
         let _fd = spawn_blocking(move || get_apt_update_lock(&download_dir))
@@ -344,7 +332,6 @@ impl<'a> OmaRefresh<'a> {
             .client(self.client)
             .download_list(tasks)
             .threads(self.threads)
-            .set_permission(0o644)
             .total_size(total)
             .build();
 

oma-refresh/src/sourceslist.rs

@@ -1,8 +1,6 @@
 use std::{
     borrow::Cow,
     fmt::Debug,
-    fs::Permissions,
-    os::unix::fs::PermissionsExt,
     path::{Path, PathBuf},
 };
 
@@ -513,10 +511,6 @@ impl MirrorSource<'_> {
             .await
             .map_err(|e| SingleDownloadError::Create { source: e })?;
 
-        f.set_permissions(Permissions::from_mode(0o644))
-            .await
-            .map_err(|e| SingleDownloadError::SetPermission { source: e })?;
-
         while let Some(chunk) = resp
             .chunk()
             .await