From 06d25870edaee04e7d2184a035d22d1dd0ebe8e3 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 29 May 2024 10:19:00 +0200
Subject: [PATCH] product-config: remove functions to check permissions, which
 are now in proxmox-sys.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
 .../src/filesystem_helpers.rs                 | 77 +------------------
 1 file changed, 1 insertion(+), 76 deletions(-)

diff --git a/proxmox-product-config/src/filesystem_helpers.rs b/proxmox-product-config/src/filesystem_helpers.rs
index efdc8f7c..2c486949 100644
--- a/proxmox-product-config/src/filesystem_helpers.rs
+++ b/proxmox-product-config/src/filesystem_helpers.rs
@@ -1,11 +1,4 @@
-use std::os::fd::{AsRawFd, FromRawFd, OwnedFd};
-use std::path::Path;
-
-use anyhow::{bail, format_err, Context, Error};
-
-use nix::fcntl::OFlag;
-use nix::sys::stat::Mode;
-use nix::unistd::{Gid, Uid};
+use anyhow::Error;
 
 use proxmox_sys::fs::CreateOptions;
 
@@ -65,74 +58,6 @@ pub fn lockfile_create_options() -> CreateOptions {
         .group(api_user.gid)
 }
 
-/// Check file/directory permissions.
-///
-/// Make sure that the file or dir is owned by uid/gid and has the correct mode.
-pub fn check_permissions<P: AsRef<Path>>(
-    dir: P,
-    uid: Uid,
-    gid: Gid,
-    mode: u32,
-) -> Result<(), Error> {
-    let uid = uid.as_raw();
-    let gid = gid.as_raw();
-    let dir = dir.as_ref();
-
-    let nix::sys::stat::FileStat {
-        st_uid,
-        st_gid,
-        st_mode,
-        ..
-    } = nix::sys::stat::stat(dir).with_context(|| format!("failed to stat {dir:?}"))?;
-
-    if st_uid != uid {
-        log::error!("bad owner on {dir:?} ({st_uid} != {uid})");
-    }
-    if st_gid != gid {
-        log::error!("bad group on {dir:?} ({st_gid} != {gid})");
-    }
-    let perms = st_mode & !nix::sys::stat::SFlag::S_IFMT.bits();
-    if perms != mode {
-        log::error!("bad permissions on {dir:?} (0o{perms:o} != 0o{mode:o})");
-    }
-
-    Ok(())
-}
-
-/// Create a new directory with uid/gid and mode.
-///
-/// Returns Ok if the directory already exists with correct access permissions.
-pub fn mkdir_permissions<P: AsRef<Path>>(
-    dir: P,
-    uid: Uid,
-    gid: Gid,
-    mode: u32,
-) -> Result<(), Error> {
-    let nix_mode = Mode::from_bits(mode).expect("bad mode bits for nix crate");
-    let dir = dir.as_ref();
-
-    match nix::unistd::mkdir(dir, nix_mode) {
-        Ok(()) => (),
-        Err(nix::errno::Errno::EEXIST) => {
-            check_permissions(dir, uid, gid, mode)
-                .map_err(|err| format_err!("unexpected permissions directory {dir:?}: {err}"))?;
-            return Ok(());
-        }
-        Err(err) => bail!("unable to create directory {dir:?} - {err}",),
-    }
-
-    let fd = nix::fcntl::open(dir, OFlag::O_DIRECTORY, Mode::empty())
-        .map(|fd| unsafe { OwnedFd::from_raw_fd(fd) })
-        .map_err(|err| format_err!("unable to open created directory {dir:?} - {err}"))?;
-    // umask defaults to 022 so make sure the mode is fully honowed:
-    nix::sys::stat::fchmod(fd.as_raw_fd(), nix_mode)
-        .map_err(|err| format_err!("unable to set mode for directory {dir:?} - {err}"))?;
-    nix::unistd::fchown(fd.as_raw_fd(), Some(uid), Some(gid))
-        .map_err(|err| format_err!("unable to set ownership directory {dir:?} - {err}"))?;
-
-    Ok(())
-}
-
 /// Atomically write data to file owned by `root:api-user.gid` with permission `0640`
 ///
 /// Only the superuser can write those files, but group 'api-user' can read them.