split proxmox-file-restore into its own crate
This also moves a couple of required utilities such as logrotate and some file descriptor methods to pbs-tools. Note that the logrotate usage and run-dir handling should be improved to work as a regular user as this *should* (IMHO) be a regular unprivileged command (including running qemu given the kvm privileges...) Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
@ -28,6 +28,7 @@ serde_json = "1.0"
|
||||
tokio = { version = "1.6", features = [ "fs", "io-util", "rt", "rt-multi-thread", "sync" ] }
|
||||
url = "2.1"
|
||||
walkdir = "2"
|
||||
zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||
|
||||
proxmox = { version = "0.13.0", default-features = false, features = [ "tokio" ] }
|
||||
|
||||
|
14
pbs-tools/src/fd.rs
Normal file
14
pbs-tools/src/fd.rs
Normal file
@ -0,0 +1,14 @@
|
||||
//! Raw file descriptor related utilities.
|
||||
|
||||
use std::os::unix::io::RawFd;
|
||||
|
||||
use anyhow::Error;
|
||||
use nix::fcntl::{fcntl, FdFlag, F_GETFD, F_SETFD};
|
||||
|
||||
/// Change the `O_CLOEXEC` flag of an existing file descriptor.
|
||||
pub fn fd_change_cloexec(fd: RawFd, on: bool) -> Result<(), Error> {
|
||||
let mut flags = unsafe { FdFlag::from_bits_unchecked(fcntl(fd, F_GETFD)?) };
|
||||
flags.set(FdFlag::FD_CLOEXEC, on);
|
||||
fcntl(fd, F_SETFD(flags))?;
|
||||
Ok(())
|
||||
}
|
@ -7,9 +7,11 @@ pub mod cert;
|
||||
pub mod cli;
|
||||
pub mod compression;
|
||||
pub mod format;
|
||||
pub mod fd;
|
||||
pub mod fs;
|
||||
pub mod io;
|
||||
pub mod json;
|
||||
pub mod logrotate;
|
||||
pub mod lru_cache;
|
||||
pub mod nom;
|
||||
pub mod ops;
|
||||
@ -19,6 +21,7 @@ pub mod sha;
|
||||
pub mod str;
|
||||
pub mod stream;
|
||||
pub mod sync;
|
||||
pub mod sys;
|
||||
pub mod ticket;
|
||||
pub mod tokio;
|
||||
pub mod xattr;
|
||||
|
239
pbs-tools/src/logrotate.rs
Normal file
239
pbs-tools/src/logrotate.rs
Normal file
@ -0,0 +1,239 @@
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::fs::{File, rename};
|
||||
use std::os::unix::io::{FromRawFd, IntoRawFd};
|
||||
use std::io::Read;
|
||||
|
||||
use anyhow::{bail, format_err, Error};
|
||||
use nix::unistd;
|
||||
|
||||
use proxmox::tools::fs::{CreateOptions, make_tmp_file};
|
||||
|
||||
/// Used for rotating log files and iterating over them
|
||||
pub struct LogRotate {
|
||||
base_path: PathBuf,
|
||||
compress: bool,
|
||||
|
||||
/// User logs should be reowned to.
|
||||
owner: Option<String>,
|
||||
}
|
||||
|
||||
impl LogRotate {
|
||||
/// Creates a new instance if the path given is a valid file name (iow. does not end with ..)
|
||||
/// 'compress' decides if compresses files will be created on rotation, and if it will search
|
||||
/// '.zst' files when iterating
|
||||
///
|
||||
/// By default, newly created files will be owned by the backup user. See [`new_with_user`] for
|
||||
/// a way to opt out of this behavior.
|
||||
pub fn new<P: AsRef<Path>>(
|
||||
path: P,
|
||||
compress: bool,
|
||||
) -> Option<Self> {
|
||||
Self::new_with_user(path, compress, Some(pbs_buildcfg::BACKUP_USER_NAME.to_owned()))
|
||||
}
|
||||
|
||||
/// See [`new`]. Additionally this also takes a user which should by default be used to reown
|
||||
/// new files to.
|
||||
pub fn new_with_user<P: AsRef<Path>>(
|
||||
path: P,
|
||||
compress: bool,
|
||||
owner: Option<String>,
|
||||
) -> Option<Self> {
|
||||
if path.as_ref().file_name().is_some() {
|
||||
Some(Self {
|
||||
base_path: path.as_ref().to_path_buf(),
|
||||
compress,
|
||||
owner,
|
||||
})
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns an iterator over the logrotated file names that exist
|
||||
pub fn file_names(&self) -> LogRotateFileNames {
|
||||
LogRotateFileNames {
|
||||
base_path: self.base_path.clone(),
|
||||
count: 0,
|
||||
compress: self.compress
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns an iterator over the logrotated file handles
|
||||
pub fn files(&self) -> LogRotateFiles {
|
||||
LogRotateFiles {
|
||||
file_names: self.file_names(),
|
||||
}
|
||||
}
|
||||
|
||||
fn compress(source_path: &PathBuf, target_path: &PathBuf, options: &CreateOptions) -> Result<(), Error> {
|
||||
let mut source = File::open(source_path)?;
|
||||
let (fd, tmp_path) = make_tmp_file(target_path, options.clone())?;
|
||||
let target = unsafe { File::from_raw_fd(fd.into_raw_fd()) };
|
||||
let mut encoder = match zstd::stream::write::Encoder::new(target, 0) {
|
||||
Ok(encoder) => encoder,
|
||||
Err(err) => {
|
||||
let _ = unistd::unlink(&tmp_path);
|
||||
bail!("creating zstd encoder failed - {}", err);
|
||||
}
|
||||
};
|
||||
|
||||
if let Err(err) = std::io::copy(&mut source, &mut encoder) {
|
||||
let _ = unistd::unlink(&tmp_path);
|
||||
bail!("zstd encoding failed for file {:?} - {}", target_path, err);
|
||||
}
|
||||
|
||||
if let Err(err) = encoder.finish() {
|
||||
let _ = unistd::unlink(&tmp_path);
|
||||
bail!("zstd finish failed for file {:?} - {}", target_path, err);
|
||||
}
|
||||
|
||||
if let Err(err) = rename(&tmp_path, target_path) {
|
||||
let _ = unistd::unlink(&tmp_path);
|
||||
bail!("rename failed for file {:?} - {}", target_path, err);
|
||||
}
|
||||
|
||||
if let Err(err) = unistd::unlink(source_path) {
|
||||
bail!("unlink failed for file {:?} - {}", source_path, err);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Rotates the files up to 'max_files'
|
||||
/// if the 'compress' option was given it will compress the newest file
|
||||
///
|
||||
/// e.g. rotates
|
||||
/// foo.2.zst => foo.3.zst
|
||||
/// foo.1 => foo.2.zst
|
||||
/// foo => foo.1
|
||||
pub fn do_rotate(&mut self, options: CreateOptions, max_files: Option<usize>) -> Result<(), Error> {
|
||||
let mut filenames: Vec<PathBuf> = self.file_names().collect();
|
||||
if filenames.is_empty() {
|
||||
return Ok(()); // no file means nothing to rotate
|
||||
}
|
||||
let count = filenames.len() + 1;
|
||||
|
||||
let mut next_filename = self.base_path.clone().canonicalize()?.into_os_string();
|
||||
next_filename.push(format!(".{}", filenames.len()));
|
||||
if self.compress && count > 2 {
|
||||
next_filename.push(".zst");
|
||||
}
|
||||
|
||||
filenames.push(PathBuf::from(next_filename));
|
||||
|
||||
for i in (0..count-1).rev() {
|
||||
if self.compress
|
||||
&& filenames[i].extension() != Some(std::ffi::OsStr::new("zst"))
|
||||
&& filenames[i+1].extension() == Some(std::ffi::OsStr::new("zst"))
|
||||
{
|
||||
Self::compress(&filenames[i], &filenames[i+1], &options)?;
|
||||
} else {
|
||||
rename(&filenames[i], &filenames[i+1])?;
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(max_files) = max_files {
|
||||
for file in filenames.iter().skip(max_files) {
|
||||
if let Err(err) = unistd::unlink(file) {
|
||||
eprintln!("could not remove {:?}: {}", &file, err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn rotate(
|
||||
&mut self,
|
||||
max_size: u64,
|
||||
options: Option<CreateOptions>,
|
||||
max_files: Option<usize>
|
||||
) -> Result<bool, Error> {
|
||||
|
||||
let options = match options {
|
||||
Some(options) => options,
|
||||
None => match self.owner.as_deref() {
|
||||
Some(owner) => {
|
||||
let user = crate::sys::query_user(owner)?
|
||||
.ok_or_else(|| {
|
||||
format_err!("failed to lookup owning user '{}' for logs", owner)
|
||||
})?;
|
||||
CreateOptions::new().owner(user.uid).group(user.gid)
|
||||
}
|
||||
None => CreateOptions::new(),
|
||||
}
|
||||
};
|
||||
|
||||
let metadata = match self.base_path.metadata() {
|
||||
Ok(metadata) => metadata,
|
||||
Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(false),
|
||||
Err(err) => bail!("unable to open task archive - {}", err),
|
||||
};
|
||||
|
||||
if metadata.len() > max_size {
|
||||
self.do_rotate(options, max_files)?;
|
||||
Ok(true)
|
||||
} else {
|
||||
Ok(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Iterator over logrotated file names
|
||||
pub struct LogRotateFileNames {
|
||||
base_path: PathBuf,
|
||||
count: usize,
|
||||
compress: bool,
|
||||
}
|
||||
|
||||
impl Iterator for LogRotateFileNames {
|
||||
type Item = PathBuf;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
if self.count > 0 {
|
||||
let mut path: std::ffi::OsString = self.base_path.clone().into();
|
||||
|
||||
path.push(format!(".{}", self.count));
|
||||
self.count += 1;
|
||||
|
||||
if Path::new(&path).is_file() {
|
||||
Some(path.into())
|
||||
} else if self.compress {
|
||||
path.push(".zst");
|
||||
if Path::new(&path).is_file() {
|
||||
Some(path.into())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else if self.base_path.is_file() {
|
||||
self.count += 1;
|
||||
Some(self.base_path.to_path_buf())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Iterator over logrotated files by returning a boxed reader
|
||||
pub struct LogRotateFiles {
|
||||
file_names: LogRotateFileNames,
|
||||
}
|
||||
|
||||
impl Iterator for LogRotateFiles {
|
||||
type Item = Box<dyn Read + Send>;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
let filename = self.file_names.next()?;
|
||||
let file = File::open(&filename).ok()?;
|
||||
|
||||
if filename.extension() == Some(std::ffi::OsStr::new("zst")) {
|
||||
let encoder = zstd::stream::read::Decoder::new(file).ok()?;
|
||||
return Some(Box::new(encoder));
|
||||
}
|
||||
|
||||
Some(Box::new(file))
|
||||
}
|
||||
}
|
31
pbs-tools/src/sys.rs
Normal file
31
pbs-tools/src/sys.rs
Normal file
@ -0,0 +1,31 @@
|
||||
//! System level helpers.
|
||||
|
||||
use nix::unistd::{Gid, Group, Uid, User};
|
||||
|
||||
/// Query a user by name but only unless built with `#[cfg(test)]`.
|
||||
///
|
||||
/// This is to avoid having regression tests query the users of development machines which may
|
||||
/// not be compatible with PBS or privileged enough.
|
||||
pub fn query_user(user_name: &str) -> Result<Option<User>, nix::Error> {
|
||||
if cfg!(test) {
|
||||
Ok(Some(
|
||||
User::from_uid(Uid::current())?.expect("current user does not exist"),
|
||||
))
|
||||
} else {
|
||||
User::from_name(user_name)
|
||||
}
|
||||
}
|
||||
|
||||
/// Query a group by name but only unless built with `#[cfg(test)]`.
|
||||
///
|
||||
/// This is to avoid having regression tests query the groups of development machines which may
|
||||
/// not be compatible with PBS or privileged enough.
|
||||
pub fn query_group(group_name: &str) -> Result<Option<Group>, nix::Error> {
|
||||
if cfg!(test) {
|
||||
Ok(Some(
|
||||
Group::from_gid(Gid::current())?.expect("current group does not exist"),
|
||||
))
|
||||
} else {
|
||||
Group::from_name(group_name)
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user