src/config: more style fixups
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
parent
91640ab567
commit
5c20e2da6b
|
@ -5,19 +5,18 @@
|
||||||
|
|
||||||
use failure::*;
|
use failure::*;
|
||||||
|
|
||||||
pub mod datastore;
|
|
||||||
|
|
||||||
use proxmox::tools::try_block;
|
use proxmox::tools::try_block;
|
||||||
|
|
||||||
use crate::buildcfg;
|
use crate::buildcfg;
|
||||||
|
|
||||||
|
pub mod datastore;
|
||||||
|
|
||||||
/// Check configuration directory permissions
|
/// Check configuration directory permissions
|
||||||
///
|
///
|
||||||
/// For security reasons, we want to make sure they are set correctly:
|
/// For security reasons, we want to make sure they are set correctly:
|
||||||
/// * owned by 'backup' user/group
|
/// * owned by 'backup' user/group
|
||||||
/// * nobody else can read (mode 0700)
|
/// * nobody else can read (mode 0700)
|
||||||
pub fn check_configdir_permissions() -> Result<(), Error> {
|
pub fn check_configdir_permissions() -> Result<(), Error> {
|
||||||
|
|
||||||
let cfgdir = buildcfg::CONFIGDIR;
|
let cfgdir = buildcfg::CONFIGDIR;
|
||||||
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
|
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
|
||||||
|
|
||||||
|
@ -36,23 +35,33 @@ pub fn check_configdir_permissions() -> Result<(), Error> {
|
||||||
bail!("wrong permission ({:o} != {:o})", perm, 0o700);
|
bail!("wrong permission ({:o} != {:o})", perm, 0o700);
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}).map_err(|err| format_err!("configuration directory '{}' permission problem - {}", cfgdir, err))
|
})
|
||||||
|
.map_err(|err| {
|
||||||
|
format_err!(
|
||||||
|
"configuration directory '{}' permission problem - {}",
|
||||||
|
cfgdir,
|
||||||
|
err
|
||||||
|
)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn create_configdir() -> Result<(), Error> {
|
pub fn create_configdir() -> Result<(), Error> {
|
||||||
|
|
||||||
use nix::sys::stat::Mode;
|
use nix::sys::stat::Mode;
|
||||||
|
|
||||||
let cfgdir = buildcfg::CONFIGDIR;
|
let cfgdir = buildcfg::CONFIGDIR;
|
||||||
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
|
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
|
||||||
|
|
||||||
match nix::unistd::mkdir(cfgdir, Mode::from_bits_truncate(0o700)) {
|
match nix::unistd::mkdir(cfgdir, Mode::from_bits_truncate(0o700)) {
|
||||||
Ok(()) => {},
|
Ok(()) => {}
|
||||||
Err(nix::Error::Sys(nix::errno::Errno::EEXIST)) => {
|
Err(nix::Error::Sys(nix::errno::Errno::EEXIST)) => {
|
||||||
check_configdir_permissions()?;
|
check_configdir_permissions()?;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
},
|
}
|
||||||
Err(err) => bail!("unable to create configuration directory '{}' - {}", cfgdir, err),
|
Err(err) => bail!(
|
||||||
|
"unable to create configuration directory '{}' - {}",
|
||||||
|
cfgdir,
|
||||||
|
err
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
try_block!({
|
try_block!({
|
||||||
|
@ -62,6 +71,12 @@ pub fn create_configdir() -> Result<(), Error> {
|
||||||
nix::unistd::chown(cfgdir, Some(uid), Some(gid))?;
|
nix::unistd::chown(cfgdir, Some(uid), Some(gid))?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}).map_err(|err: Error| format_err!(
|
})
|
||||||
"unable to set configuration directory '{}' permissions - {}", cfgdir, err))
|
.map_err(|err: Error| {
|
||||||
|
format_err!(
|
||||||
|
"unable to set configuration directory '{}' permissions - {}",
|
||||||
|
cfgdir,
|
||||||
|
err
|
||||||
|
)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue