2019-12-16 11:13:48 +00:00
|
|
|
use std::collections::HashMap;
|
2020-02-26 16:14:19 +00:00
|
|
|
use std::convert::TryFrom;
|
2020-03-23 14:03:18 +00:00
|
|
|
use std::ffi::{CStr, CString, OsStr, OsString};
|
|
|
|
use std::future::Future;
|
2019-11-21 11:47:51 +00:00
|
|
|
use std::io::Write;
|
2020-03-23 14:03:18 +00:00
|
|
|
use std::mem;
|
2019-11-21 11:47:51 +00:00
|
|
|
use std::os::unix::ffi::OsStrExt;
|
2020-03-23 14:03:18 +00:00
|
|
|
use std::os::unix::io::{AsRawFd, FromRawFd};
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use std::pin::Pin;
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2020-04-17 12:11:25 +00:00
|
|
|
use anyhow::{bail, format_err, Error};
|
2020-03-23 14:03:18 +00:00
|
|
|
use nix::dir::Dir;
|
|
|
|
use nix::fcntl::OFlag;
|
|
|
|
use nix::sys::stat::Mode;
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
use pathpatterns::{MatchEntry, MatchList, MatchPattern, MatchType, PatternFlag};
|
|
|
|
use proxmox::api::api;
|
|
|
|
use proxmox::api::cli::{self, CliCommand, CliCommandMap, CliHelper, CommandLineInterface};
|
|
|
|
use proxmox::c_result;
|
|
|
|
use proxmox::tools::fs::{create_path, CreateOptions};
|
|
|
|
use pxar::{EntryKind, Metadata};
|
2020-01-31 07:16:00 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
use crate::backup::catalog::{self, DirEntryAttribute};
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
// FIXME: Remove looku_self() calls by putting Directory into the dir stack
|
|
|
|
use crate::pxar::dir_stack::PxarDirStack;
|
2020-06-10 09:03:42 +00:00
|
|
|
use crate::pxar::Flags;
|
2020-03-23 14:03:18 +00:00
|
|
|
use crate::pxar::fuse::{Accessor, FileEntry};
|
|
|
|
use crate::pxar::metadata;
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
type CatalogReader = crate::backup::CatalogReader<std::fs::File>;
|
2019-11-26 11:41:58 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
const MAX_SYMLINK_COUNT: usize = 40;
|
|
|
|
|
|
|
|
static mut SHELL: Option<usize> = None;
|
2019-11-26 11:41:58 +00:00
|
|
|
|
2019-12-06 08:35:47 +00:00
|
|
|
/// This list defines all the shell commands and their properties
|
|
|
|
/// using the api schema
|
2019-12-06 08:42:05 +00:00
|
|
|
pub fn catalog_shell_cli() -> CommandLineInterface {
|
2020-03-23 14:03:18 +00:00
|
|
|
CommandLineInterface::Nested(
|
|
|
|
CliCommandMap::new()
|
|
|
|
.insert("pwd", CliCommand::new(&API_METHOD_PWD_COMMAND))
|
|
|
|
.insert(
|
|
|
|
"cd",
|
|
|
|
CliCommand::new(&API_METHOD_CD_COMMAND)
|
|
|
|
.arg_param(&["path"])
|
|
|
|
.completion_cb("path", complete_path),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"ls",
|
|
|
|
CliCommand::new(&API_METHOD_LS_COMMAND)
|
|
|
|
.arg_param(&["path"])
|
|
|
|
.completion_cb("path", complete_path),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"stat",
|
|
|
|
CliCommand::new(&API_METHOD_STAT_COMMAND)
|
|
|
|
.arg_param(&["path"])
|
|
|
|
.completion_cb("path", complete_path),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"select",
|
|
|
|
CliCommand::new(&API_METHOD_SELECT_COMMAND)
|
|
|
|
.arg_param(&["path"])
|
|
|
|
.completion_cb("path", complete_path),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"deselect",
|
|
|
|
CliCommand::new(&API_METHOD_DESELECT_COMMAND)
|
|
|
|
.arg_param(&["path"])
|
|
|
|
.completion_cb("path", complete_path),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"clear-selected",
|
|
|
|
CliCommand::new(&API_METHOD_CLEAR_SELECTED_COMMAND),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"list-selected",
|
|
|
|
CliCommand::new(&API_METHOD_LIST_SELECTED_COMMAND),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"restore-selected",
|
|
|
|
CliCommand::new(&API_METHOD_RESTORE_SELECTED_COMMAND)
|
|
|
|
.arg_param(&["target"])
|
|
|
|
.completion_cb("target", crate::tools::complete_file_name),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"restore",
|
|
|
|
CliCommand::new(&API_METHOD_RESTORE_COMMAND)
|
|
|
|
.arg_param(&["target"])
|
|
|
|
.completion_cb("target", crate::tools::complete_file_name),
|
|
|
|
)
|
|
|
|
.insert(
|
|
|
|
"find",
|
|
|
|
CliCommand::new(&API_METHOD_FIND_COMMAND).arg_param(&["pattern"]),
|
|
|
|
)
|
|
|
|
.insert_help(),
|
|
|
|
)
|
2019-12-06 08:35:47 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
fn complete_path(complete_me: &str, _map: &HashMap<String, String>) -> Vec<String> {
|
|
|
|
let shell: &mut Shell = unsafe { std::mem::transmute(SHELL.unwrap()) };
|
|
|
|
match shell.complete_path(complete_me) {
|
|
|
|
Ok(list) => list,
|
|
|
|
Err(err) => {
|
|
|
|
eprintln!("error during completion: {}", err);
|
|
|
|
Vec::new()
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(input: { properties: {} })]
|
|
|
|
/// List the current working directory.
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn pwd_command() -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.pwd()).await
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
path: {
|
|
|
|
type: String,
|
|
|
|
optional: true,
|
|
|
|
description: "target path."
|
|
|
|
}
|
|
|
|
}
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
2019-12-05 16:23:21 +00:00
|
|
|
)]
|
|
|
|
/// Change the current working directory to the new directory
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn cd_command(path: Option<String>) -> Result<(), Error> {
|
|
|
|
let path = path.as_ref().map(Path::new);
|
|
|
|
Shell::with(move |shell| shell.cd(path)).await
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
path: {
|
|
|
|
type: String,
|
|
|
|
optional: true,
|
|
|
|
description: "target path."
|
|
|
|
}
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-05 16:23:21 +00:00
|
|
|
)]
|
|
|
|
/// List the content of working directory or given path.
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn ls_command(path: Option<String>) -> Result<(), Error> {
|
|
|
|
let path = path.as_ref().map(Path::new);
|
|
|
|
Shell::with(move |shell| shell.ls(path)).await
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
path: {
|
|
|
|
type: String,
|
|
|
|
description: "target path."
|
|
|
|
}
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-05 16:23:21 +00:00
|
|
|
)]
|
|
|
|
/// Read the metadata for a given directory entry.
|
|
|
|
///
|
2020-03-23 14:03:18 +00:00
|
|
|
/// This is expensive because the data has to be read from the pxar archive, which means reading
|
|
|
|
/// over the network.
|
|
|
|
async fn stat_command(path: String) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.stat(PathBuf::from(path))).await
|
2019-11-26 11:41:58 +00:00
|
|
|
}
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
path: {
|
|
|
|
type: String,
|
|
|
|
description: "target path."
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
)]
|
|
|
|
/// Select an entry for restore.
|
|
|
|
///
|
|
|
|
/// This will return an error if the entry is already present in the list or
|
|
|
|
/// if an invalid path was provided.
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn select_command(path: String) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.select(PathBuf::from(path))).await
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
path: {
|
|
|
|
type: String,
|
|
|
|
description: "path to entry to remove from list."
|
|
|
|
}
|
|
|
|
}
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
2019-12-05 16:23:21 +00:00
|
|
|
)]
|
|
|
|
/// Deselect an entry for restore.
|
|
|
|
///
|
|
|
|
/// This will return an error if the entry was not found in the list of entries
|
|
|
|
/// selected for restore.
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn deselect_command(path: String) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.deselect(PathBuf::from(path))).await
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2020-02-27 13:33:33 +00:00
|
|
|
#[api( input: { properties: { } })]
|
|
|
|
/// Clear the list of files selected for restore.
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn clear_selected_command() -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.deselect_all()).await
|
2020-02-27 13:33:33 +00:00
|
|
|
}
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
2020-03-23 14:03:18 +00:00
|
|
|
patterns: {
|
|
|
|
type: Boolean,
|
|
|
|
description: "List match patterns instead of the matching files.",
|
|
|
|
optional: true,
|
|
|
|
default: false,
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
|
|
|
}
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
2019-12-05 16:23:21 +00:00
|
|
|
)]
|
2020-03-23 14:03:18 +00:00
|
|
|
/// List entries currently selected for restore.
|
|
|
|
async fn list_selected_command(patterns: bool) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.list_selected(patterns)).await
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2020-02-27 13:22:04 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
pattern: {
|
2020-03-23 14:03:18 +00:00
|
|
|
type: String,
|
|
|
|
description: "Match pattern for matching files in the catalog."
|
|
|
|
},
|
|
|
|
select: {
|
|
|
|
type: bool,
|
2020-02-27 13:22:04 +00:00
|
|
|
optional: true,
|
2020-03-23 14:03:18 +00:00
|
|
|
default: false,
|
|
|
|
description: "Add matching filenames to list for restore."
|
2020-02-27 13:22:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
)]
|
2020-03-23 14:03:18 +00:00
|
|
|
/// Find entries in the catalog matching the given match pattern.
|
|
|
|
async fn find_command(pattern: String, select: bool) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.find(pattern, select)).await
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
2019-11-21 11:47:51 +00:00
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
|
|
|
target: {
|
|
|
|
type: String,
|
|
|
|
description: "target path for restore on local filesystem."
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
)]
|
2020-03-23 14:03:18 +00:00
|
|
|
/// Restore the selected entries to the given target path.
|
2019-12-05 16:23:21 +00:00
|
|
|
///
|
2020-03-23 14:03:18 +00:00
|
|
|
/// Target must not exist on the clients filesystem.
|
|
|
|
async fn restore_selected_command(target: String) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.restore_selected(PathBuf::from(target))).await
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
|
|
|
|
2019-12-16 11:13:48 +00:00
|
|
|
#[api(
|
|
|
|
input: {
|
|
|
|
properties: {
|
2020-03-23 14:03:18 +00:00
|
|
|
target: {
|
2019-12-16 11:13:48 +00:00
|
|
|
type: String,
|
2020-03-23 14:03:18 +00:00
|
|
|
description: "target path for restore on local filesystem."
|
2019-12-16 11:13:48 +00:00
|
|
|
},
|
|
|
|
pattern: {
|
|
|
|
type: String,
|
|
|
|
optional: true,
|
2020-03-23 14:03:18 +00:00
|
|
|
description: "match pattern to limit files for restore."
|
2019-12-16 11:13:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
)]
|
2020-03-23 14:03:18 +00:00
|
|
|
/// Restore the sub-archive given by the current working directory to target.
|
|
|
|
///
|
|
|
|
/// By further providing a pattern, the restore can be limited to a narrower
|
|
|
|
/// subset of this sub-archive.
|
|
|
|
/// If pattern is not present or empty, the full archive is restored to target.
|
|
|
|
async fn restore_command(target: String, pattern: Option<String>) -> Result<(), Error> {
|
|
|
|
Shell::with(move |shell| shell.restore(PathBuf::from(target), pattern)).await
|
|
|
|
}
|
2019-12-16 11:13:48 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
/// FIXME: Should we use this to fix `step()`?
|
|
|
|
///
|
|
|
|
/// The `Path` type's component iterator does not tell us anything about trailing slashes or
|
|
|
|
/// trailing `Component::CurDir` entries. Since we only support regular paths we'll roll our own
|
|
|
|
/// here:
|
|
|
|
enum PathComponent<'a> {
|
|
|
|
Root,
|
|
|
|
CurDir,
|
|
|
|
ParentDir,
|
|
|
|
Normal(&'a OsStr),
|
|
|
|
TrailingSlash,
|
|
|
|
}
|
|
|
|
|
|
|
|
struct PathComponentIter<'a> {
|
|
|
|
path: &'a [u8],
|
|
|
|
state: u8, // 0=beginning, 1=ongoing, 2=trailing, 3=finished (fused)
|
|
|
|
}
|
2019-12-16 11:13:48 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
impl std::iter::FusedIterator for PathComponentIter<'_> {}
|
|
|
|
|
|
|
|
impl<'a> Iterator for PathComponentIter<'a> {
|
|
|
|
type Item = PathComponent<'a>;
|
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
if self.path.is_empty() {
|
|
|
|
return None;
|
2019-12-16 11:13:48 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
if self.state == 0 {
|
|
|
|
self.state = 1;
|
|
|
|
if self.path[0] == b'/' {
|
|
|
|
// absolute path
|
|
|
|
self.path = &self.path[1..];
|
|
|
|
return Some(PathComponent::Root);
|
|
|
|
}
|
|
|
|
}
|
2019-12-16 11:13:48 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
// skip slashes
|
|
|
|
let had_slashes = self.path[0] == b'/';
|
|
|
|
while self.path.get(0).copied() == Some(b'/') {
|
|
|
|
self.path = &self.path[1..];
|
|
|
|
}
|
|
|
|
|
|
|
|
Some(match self.path {
|
|
|
|
[] if had_slashes => PathComponent::TrailingSlash,
|
|
|
|
[] => return None,
|
|
|
|
[b'.'] | [b'.', b'/', ..] => {
|
|
|
|
self.path = &self.path[1..];
|
|
|
|
PathComponent::CurDir
|
|
|
|
}
|
|
|
|
[b'.', b'.'] | [b'.', b'.', b'/', ..] => {
|
|
|
|
self.path = &self.path[2..];
|
|
|
|
PathComponent::ParentDir
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
let end = self
|
|
|
|
.path
|
|
|
|
.iter()
|
|
|
|
.position(|&b| b == b'/')
|
|
|
|
.unwrap_or(self.path.len());
|
|
|
|
let (out, rest) = self.path.split_at(end);
|
|
|
|
self.path = rest;
|
|
|
|
PathComponent::Normal(OsStr::from_bytes(out))
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
pub struct Shell {
|
|
|
|
/// Readline instance handling input and callbacks
|
|
|
|
rl: rustyline::Editor<CliHelper>,
|
|
|
|
|
|
|
|
/// Interactive prompt.
|
|
|
|
prompt: String,
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
/// Calalog reader instance to navigate
|
2020-03-23 14:03:18 +00:00
|
|
|
catalog: CatalogReader,
|
|
|
|
|
2019-12-05 16:23:21 +00:00
|
|
|
/// List of selected paths for restore
|
2020-03-23 14:03:18 +00:00
|
|
|
selected: HashMap<OsString, MatchEntry>,
|
|
|
|
|
|
|
|
/// pxar accessor instance for the current pxar archive
|
|
|
|
accessor: Accessor,
|
|
|
|
|
|
|
|
/// The current position in the archive.
|
|
|
|
position: Vec<PathStackEntry>,
|
2019-12-05 16:23:21 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
#[derive(Clone)]
|
|
|
|
struct PathStackEntry {
|
|
|
|
/// This is always available. We mainly navigate through the catalog.
|
|
|
|
catalog: catalog::DirEntry,
|
|
|
|
|
|
|
|
/// Whenever we need something from the actual archive we fill this out. This is cached along
|
|
|
|
/// the entire path.
|
|
|
|
pxar: Option<FileEntry>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PathStackEntry {
|
|
|
|
fn new(dir_entry: catalog::DirEntry) -> Self {
|
|
|
|
Self {
|
|
|
|
pxar: None,
|
|
|
|
catalog: dir_entry,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Shell {
|
|
|
|
/// Create a new shell for the given catalog and pxar archive.
|
|
|
|
pub async fn new(
|
|
|
|
mut catalog: CatalogReader,
|
|
|
|
archive_name: &str,
|
|
|
|
archive: Accessor,
|
|
|
|
) -> Result<Self, Error> {
|
|
|
|
let cli_helper = CliHelper::new(catalog_shell_cli());
|
|
|
|
let mut rl = rustyline::Editor::<CliHelper>::new();
|
|
|
|
rl.set_helper(Some(cli_helper));
|
|
|
|
|
|
|
|
let catalog_root = catalog.root()?;
|
|
|
|
let archive_root = catalog
|
|
|
|
.lookup(&catalog_root, archive_name.as_bytes())?
|
|
|
|
.ok_or_else(|| format_err!("archive not found in catalog"))?;
|
|
|
|
let position = vec![PathStackEntry::new(archive_root)];
|
|
|
|
|
|
|
|
let mut this = Self {
|
|
|
|
rl,
|
|
|
|
prompt: String::new(),
|
|
|
|
catalog,
|
|
|
|
selected: HashMap::new(),
|
|
|
|
accessor: archive,
|
|
|
|
position,
|
|
|
|
};
|
|
|
|
this.update_prompt();
|
|
|
|
Ok(this)
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn with<'a, Fut, R, F>(call: F) -> Result<R, Error>
|
2019-12-05 16:23:21 +00:00
|
|
|
where
|
2020-03-23 14:03:18 +00:00
|
|
|
F: FnOnce(&'a mut Shell) -> Fut,
|
|
|
|
Fut: Future<Output = Result<R, Error>>,
|
|
|
|
F: 'a,
|
|
|
|
Fut: 'a,
|
|
|
|
R: 'static,
|
2019-12-05 16:23:21 +00:00
|
|
|
{
|
2020-03-23 14:03:18 +00:00
|
|
|
let shell: &mut Shell = unsafe { std::mem::transmute(SHELL.unwrap()) };
|
|
|
|
let result = call(&mut *shell).await;
|
|
|
|
result
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
pub async fn shell(mut self) -> Result<(), Error> {
|
|
|
|
let this = &mut self;
|
|
|
|
unsafe {
|
|
|
|
SHELL = Some(this as *mut Shell as usize);
|
|
|
|
}
|
|
|
|
while let Ok(line) = this.rl.readline(&this.prompt) {
|
|
|
|
let helper = this.rl.helper().unwrap();
|
|
|
|
let args = match cli::shellword_split(&line) {
|
|
|
|
Ok(args) => args,
|
|
|
|
Err(err) => {
|
|
|
|
println!("Error: {}", err);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let _ =
|
|
|
|
cli::handle_command_future(helper.cmd_def(), "", args, cli::CliEnvironment::new())
|
|
|
|
.await;
|
|
|
|
this.rl.add_history_entry(line);
|
|
|
|
this.update_prompt();
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_prompt(&mut self) {
|
|
|
|
self.prompt = "pxar:".to_string();
|
|
|
|
if self.position.len() <= 1 {
|
|
|
|
self.prompt.push('/');
|
|
|
|
} else {
|
|
|
|
for p in self.position.iter().skip(1) {
|
|
|
|
if !p.catalog.name.starts_with(b"/") {
|
|
|
|
self.prompt.push('/');
|
|
|
|
}
|
|
|
|
match std::str::from_utf8(&p.catalog.name) {
|
|
|
|
Ok(entry) => self.prompt.push_str(entry),
|
|
|
|
Err(_) => self.prompt.push_str("<non-utf8-dir>"),
|
|
|
|
}
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
self.prompt.push_str(" > ");
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn pwd(&mut self) -> Result<(), Error> {
|
|
|
|
let stack = Self::lookup(
|
|
|
|
&self.position,
|
|
|
|
&mut self.catalog,
|
|
|
|
&self.accessor,
|
|
|
|
None,
|
|
|
|
&mut Some(0),
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
let path = Self::format_path_stack(&stack);
|
|
|
|
println!("{:?}", path);
|
|
|
|
Ok(())
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
fn new_path_stack(&self) -> Vec<PathStackEntry> {
|
|
|
|
self.position[..1].to_vec()
|
2019-11-21 11:47:51 +00:00
|
|
|
}
|
2020-02-27 16:12:58 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn resolve_symlink(
|
|
|
|
stack: &mut Vec<PathStackEntry>,
|
|
|
|
catalog: &mut CatalogReader,
|
|
|
|
accessor: &Accessor,
|
|
|
|
follow_symlinks: &mut Option<usize>,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
if let Some(ref mut symlink_count) = follow_symlinks {
|
|
|
|
*symlink_count += 1;
|
|
|
|
if *symlink_count > MAX_SYMLINK_COUNT {
|
|
|
|
bail!("too many levels of symbolic links");
|
|
|
|
}
|
2020-02-27 16:12:58 +00:00
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
let file = Self::walk_pxar_archive(accessor, &mut stack[..]).await?;
|
|
|
|
|
|
|
|
let path = match file.entry().kind() {
|
|
|
|
EntryKind::Symlink(symlink) => Path::new(symlink.as_os_str()),
|
|
|
|
_ => bail!("symlink in the catalog was not a symlink in the archive"),
|
|
|
|
};
|
|
|
|
|
|
|
|
let new_stack =
|
|
|
|
Self::lookup(&stack, &mut *catalog, accessor, Some(path), follow_symlinks).await?;
|
|
|
|
|
|
|
|
*stack = new_stack;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
} else {
|
|
|
|
bail!("target is a symlink");
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
/// Walk a path and add it to the path stack.
|
|
|
|
///
|
|
|
|
/// If the symlink count is used, symlinks will be followed, until we hit the cap and error
|
|
|
|
/// out.
|
|
|
|
async fn step(
|
|
|
|
stack: &mut Vec<PathStackEntry>,
|
|
|
|
catalog: &mut CatalogReader,
|
|
|
|
accessor: &Accessor,
|
|
|
|
component: std::path::Component<'_>,
|
|
|
|
follow_symlinks: &mut Option<usize>,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
use std::path::Component;
|
|
|
|
match component {
|
|
|
|
Component::Prefix(_) => bail!("invalid path component (prefix)"),
|
|
|
|
Component::RootDir => stack.truncate(1),
|
|
|
|
Component::CurDir => {
|
|
|
|
if stack.last().unwrap().catalog.is_symlink() {
|
|
|
|
Self::resolve_symlink(stack, catalog, accessor, follow_symlinks).await?;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Component::ParentDir => drop(stack.pop()),
|
|
|
|
Component::Normal(entry) => {
|
|
|
|
if stack.last().unwrap().catalog.is_symlink() {
|
|
|
|
Self::resolve_symlink(stack, catalog, accessor, follow_symlinks).await?;
|
|
|
|
}
|
|
|
|
match catalog.lookup(&stack.last().unwrap().catalog, entry.as_bytes())? {
|
|
|
|
Some(dir) => stack.push(PathStackEntry::new(dir)),
|
|
|
|
None => bail!("no such file or directory: {:?}", entry),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
fn step_nofollow(
|
|
|
|
stack: &mut Vec<PathStackEntry>,
|
|
|
|
catalog: &mut CatalogReader,
|
|
|
|
component: std::path::Component<'_>,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
use std::path::Component;
|
|
|
|
match component {
|
|
|
|
Component::Prefix(_) => bail!("invalid path component (prefix)"),
|
|
|
|
Component::RootDir => stack.truncate(1),
|
|
|
|
Component::CurDir => {
|
|
|
|
if stack.last().unwrap().catalog.is_symlink() {
|
|
|
|
bail!("target is a symlink");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Component::ParentDir => drop(stack.pop()),
|
|
|
|
Component::Normal(entry) => {
|
|
|
|
if stack.last().unwrap().catalog.is_symlink() {
|
|
|
|
bail!("target is a symlink");
|
|
|
|
} else {
|
|
|
|
match catalog.lookup(&stack.last().unwrap().catalog, entry.as_bytes())? {
|
|
|
|
Some(dir) => stack.push(PathStackEntry::new(dir)),
|
|
|
|
None => bail!("no such file or directory: {:?}", entry),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// The pxar accessor is required to resolve symbolic links
|
|
|
|
async fn walk_catalog(
|
|
|
|
stack: &mut Vec<PathStackEntry>,
|
|
|
|
catalog: &mut CatalogReader,
|
|
|
|
accessor: &Accessor,
|
|
|
|
path: &Path,
|
|
|
|
follow_symlinks: &mut Option<usize>,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
for c in path.components() {
|
|
|
|
Self::step(stack, catalog, accessor, c, follow_symlinks).await?;
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Non-async version cannot follow symlinks.
|
|
|
|
fn walk_catalog_nofollow(
|
|
|
|
stack: &mut Vec<PathStackEntry>,
|
|
|
|
catalog: &mut CatalogReader,
|
|
|
|
path: &Path,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
for c in path.components() {
|
|
|
|
Self::step_nofollow(stack, catalog, c)?;
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This assumes that there are no more symlinks in the path stack.
|
|
|
|
async fn walk_pxar_archive(
|
|
|
|
accessor: &Accessor,
|
|
|
|
mut stack: &mut [PathStackEntry],
|
|
|
|
) -> Result<FileEntry, Error> {
|
|
|
|
if stack[0].pxar.is_none() {
|
|
|
|
stack[0].pxar = Some(accessor.open_root().await?.lookup_self().await?);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now walk the directory stack:
|
|
|
|
let mut at = 1;
|
|
|
|
while at < stack.len() {
|
|
|
|
if stack[at].pxar.is_some() {
|
|
|
|
at += 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
let parent = stack[at - 1].pxar.as_ref().unwrap();
|
|
|
|
let dir = parent.enter_directory().await?;
|
|
|
|
let name = Path::new(OsStr::from_bytes(&stack[at].catalog.name));
|
|
|
|
stack[at].pxar = Some(
|
|
|
|
dir.lookup(name)
|
|
|
|
.await?
|
|
|
|
.ok_or_else(|| format_err!("no such entry in pxar file: {:?}", name))?,
|
|
|
|
);
|
|
|
|
|
|
|
|
at += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(stack.last().unwrap().pxar.clone().unwrap())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn complete_path(&mut self, input: &str) -> Result<Vec<String>, Error> {
|
|
|
|
let mut tmp_stack;
|
|
|
|
let (parent, base, part) = match input.rfind('/') {
|
|
|
|
Some(ind) => {
|
|
|
|
let (base, part) = input.split_at(ind + 1);
|
|
|
|
let path = PathBuf::from(base);
|
|
|
|
if path.is_absolute() {
|
|
|
|
tmp_stack = self.new_path_stack();
|
|
|
|
} else {
|
|
|
|
tmp_stack = self.position.clone();
|
|
|
|
}
|
|
|
|
Self::walk_catalog_nofollow(&mut tmp_stack, &mut self.catalog, &path)?;
|
|
|
|
(&tmp_stack.last().unwrap().catalog, base, part)
|
|
|
|
}
|
|
|
|
None => (&self.position.last().unwrap().catalog, "", input),
|
|
|
|
};
|
|
|
|
|
|
|
|
let entries = self.catalog.read_dir(parent)?;
|
|
|
|
|
|
|
|
let mut out = Vec::new();
|
|
|
|
for entry in entries {
|
|
|
|
let mut name = base.to_string();
|
|
|
|
if entry.name.starts_with(part.as_bytes()) {
|
|
|
|
name.push_str(std::str::from_utf8(&entry.name)?);
|
|
|
|
if entry.is_directory() {
|
|
|
|
name.push('/');
|
|
|
|
}
|
|
|
|
out.push(name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(out)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Break async recursion here: lookup -> walk_catalog -> step -> lookup
|
|
|
|
fn lookup<'future, 's, 'c, 'a, 'p, 'y>(
|
|
|
|
stack: &'s [PathStackEntry],
|
|
|
|
catalog: &'c mut CatalogReader,
|
|
|
|
accessor: &'a Accessor,
|
|
|
|
path: Option<&'p Path>,
|
|
|
|
follow_symlinks: &'y mut Option<usize>,
|
|
|
|
) -> Pin<Box<dyn Future<Output = Result<Vec<PathStackEntry>, Error>> + Send + 'future>>
|
|
|
|
where
|
|
|
|
's: 'future,
|
|
|
|
'c: 'future,
|
|
|
|
'a: 'future,
|
|
|
|
'p: 'future,
|
|
|
|
'y: 'future,
|
|
|
|
{
|
|
|
|
Box::pin(async move {
|
|
|
|
Ok(match path {
|
|
|
|
None => stack.to_vec(),
|
|
|
|
Some(path) => {
|
|
|
|
let mut stack = if path.is_absolute() {
|
|
|
|
stack[..1].to_vec()
|
|
|
|
} else {
|
|
|
|
stack.to_vec()
|
|
|
|
};
|
|
|
|
Self::walk_catalog(&mut stack, catalog, accessor, path, follow_symlinks)
|
|
|
|
.await?;
|
|
|
|
stack
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn ls(&mut self, path: Option<&Path>) -> Result<(), Error> {
|
|
|
|
let stack = Self::lookup(
|
|
|
|
&self.position,
|
|
|
|
&mut self.catalog,
|
|
|
|
&self.accessor,
|
|
|
|
path,
|
|
|
|
&mut Some(0),
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
let last = stack.last().unwrap();
|
|
|
|
if last.catalog.is_directory() {
|
|
|
|
let items = self.catalog.read_dir(&stack.last().unwrap().catalog)?;
|
|
|
|
let mut out = std::io::stdout();
|
|
|
|
// FIXME: columnize
|
|
|
|
for item in items {
|
|
|
|
out.write_all(&item.name)?;
|
|
|
|
out.write_all(b"\n")?;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
let mut out = std::io::stdout();
|
|
|
|
out.write_all(&last.catalog.name)?;
|
|
|
|
out.write_all(b"\n")?;
|
|
|
|
}
|
|
|
|
Ok(())
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn stat(&mut self, path: PathBuf) -> Result<(), Error> {
|
|
|
|
let mut stack = Self::lookup(
|
|
|
|
&self.position,
|
|
|
|
&mut self.catalog,
|
|
|
|
&self.accessor,
|
|
|
|
Some(&path),
|
|
|
|
&mut Some(0),
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
let file = Self::walk_pxar_archive(&self.accessor, &mut stack).await?;
|
|
|
|
std::io::stdout()
|
|
|
|
.write_all(crate::pxar::format_multi_line_entry(file.entry()).as_bytes())?;
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn cd(&mut self, path: Option<&Path>) -> Result<(), Error> {
|
|
|
|
match path {
|
|
|
|
Some(path) => {
|
|
|
|
let new_position = Self::lookup(
|
|
|
|
&self.position,
|
|
|
|
&mut self.catalog,
|
|
|
|
&self.accessor,
|
|
|
|
Some(path),
|
|
|
|
&mut None,
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
if !new_position.last().unwrap().catalog.is_directory() {
|
|
|
|
bail!("not a directory");
|
|
|
|
}
|
|
|
|
self.position = new_position;
|
|
|
|
}
|
|
|
|
None => self.position.truncate(1),
|
|
|
|
}
|
|
|
|
self.update_prompt();
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This stack must have been canonicalized already!
|
|
|
|
fn format_path_stack(stack: &[PathStackEntry]) -> OsString {
|
|
|
|
if stack.len() <= 1 {
|
|
|
|
return OsString::from("/");
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut out = OsString::new();
|
|
|
|
for c in stack.iter().skip(1) {
|
|
|
|
out.push("/");
|
|
|
|
out.push(OsStr::from_bytes(&c.catalog.name));
|
|
|
|
}
|
|
|
|
|
|
|
|
out
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn select(&mut self, path: PathBuf) -> Result<(), Error> {
|
|
|
|
let stack = Self::lookup(
|
|
|
|
&self.position,
|
|
|
|
&mut self.catalog,
|
|
|
|
&self.accessor,
|
|
|
|
Some(&path),
|
|
|
|
&mut Some(0),
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
let path = Self::format_path_stack(&stack);
|
|
|
|
let entry = MatchEntry::include(MatchPattern::Literal(path.as_bytes().to_vec()));
|
|
|
|
if self.selected.insert(path.clone(), entry).is_some() {
|
|
|
|
println!("path already selected: {:?}", path);
|
|
|
|
} else {
|
|
|
|
println!("added path: {:?}", path);
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn deselect(&mut self, path: PathBuf) -> Result<(), Error> {
|
|
|
|
let stack = Self::lookup(
|
|
|
|
&self.position,
|
|
|
|
&mut self.catalog,
|
|
|
|
&self.accessor,
|
|
|
|
Some(&path),
|
|
|
|
&mut Some(0),
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
let path = Self::format_path_stack(&stack);
|
|
|
|
|
|
|
|
if self.selected.remove(&path).is_some() {
|
|
|
|
println!("removed path from selection: {:?}", path);
|
|
|
|
} else {
|
|
|
|
println!("path not selected: {:?}", path);
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn deselect_all(&mut self) -> Result<(), Error> {
|
|
|
|
self.selected.clear();
|
|
|
|
println!("cleared selection");
|
|
|
|
Ok(())
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn list_selected(&mut self, patterns: bool) -> Result<(), Error> {
|
|
|
|
if patterns {
|
|
|
|
self.list_selected_patterns().await
|
2020-02-27 16:12:58 +00:00
|
|
|
} else {
|
2020-03-23 14:03:18 +00:00
|
|
|
self.list_matching_files().await
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn list_selected_patterns(&self) -> Result<(), Error> {
|
|
|
|
for entry in self.selected.keys() {
|
|
|
|
println!("{:?}", entry);
|
|
|
|
}
|
|
|
|
Ok(())
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
fn build_match_list(&self) -> Vec<MatchEntry> {
|
|
|
|
let mut list = Vec::with_capacity(self.selected.len());
|
|
|
|
for entry in self.selected.values() {
|
|
|
|
list.push(entry.clone());
|
|
|
|
}
|
|
|
|
list
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn list_matching_files(&mut self) -> Result<(), Error> {
|
|
|
|
let matches = self.build_match_list();
|
|
|
|
|
|
|
|
self.catalog.find(
|
|
|
|
&self.position[0].catalog,
|
|
|
|
&mut Vec::new(),
|
|
|
|
&matches,
|
|
|
|
&mut |path: &[u8]| -> Result<(), Error> {
|
|
|
|
let mut out = std::io::stdout();
|
|
|
|
out.write_all(path)?;
|
|
|
|
out.write_all(b"\n")?;
|
|
|
|
Ok(())
|
|
|
|
},
|
|
|
|
)?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn find(&mut self, pattern: String, select: bool) -> Result<(), Error> {
|
|
|
|
let pattern_os = OsString::from(pattern.clone());
|
|
|
|
let pattern_entry =
|
|
|
|
MatchEntry::parse_pattern(pattern, PatternFlag::PATH_NAME, MatchType::Include)?;
|
|
|
|
|
|
|
|
let mut found_some = false;
|
|
|
|
self.catalog.find(
|
|
|
|
&self.position[0].catalog,
|
|
|
|
&mut Vec::new(),
|
|
|
|
&[&pattern_entry],
|
|
|
|
&mut |path: &[u8]| -> Result<(), Error> {
|
|
|
|
found_some = true;
|
|
|
|
let mut out = std::io::stdout();
|
|
|
|
out.write_all(path)?;
|
|
|
|
out.write_all(b"\n")?;
|
|
|
|
Ok(())
|
|
|
|
},
|
|
|
|
)?;
|
|
|
|
|
|
|
|
if found_some && select {
|
|
|
|
self.selected.insert(pattern_os, pattern_entry);
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn restore_selected(&mut self, destination: PathBuf) -> Result<(), Error> {
|
|
|
|
if self.selected.is_empty() {
|
|
|
|
bail!("no entries selected");
|
|
|
|
}
|
|
|
|
|
|
|
|
let match_list = self.build_match_list();
|
|
|
|
|
|
|
|
self.restore_with_match_list(destination, &match_list).await
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn restore(
|
2020-02-27 16:12:58 +00:00
|
|
|
&mut self,
|
2020-03-23 14:03:18 +00:00
|
|
|
destination: PathBuf,
|
|
|
|
pattern: Option<String>,
|
2020-02-27 16:12:58 +00:00
|
|
|
) -> Result<(), Error> {
|
2020-03-23 14:03:18 +00:00
|
|
|
let tmp;
|
|
|
|
let match_list: &[MatchEntry] = match pattern {
|
|
|
|
None => &[],
|
|
|
|
Some(pattern) => {
|
|
|
|
tmp = [MatchEntry::parse_pattern(
|
|
|
|
pattern,
|
|
|
|
PatternFlag::PATH_NAME,
|
|
|
|
MatchType::Include,
|
|
|
|
)?];
|
|
|
|
&tmp
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
self.restore_with_match_list(destination, match_list).await
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn restore_with_match_list(
|
|
|
|
&mut self,
|
|
|
|
destination: PathBuf,
|
|
|
|
match_list: &[MatchEntry],
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
create_path(
|
|
|
|
&destination,
|
|
|
|
None,
|
|
|
|
Some(CreateOptions::new().perm(Mode::from_bits_truncate(0o700))),
|
|
|
|
)
|
|
|
|
.map_err(|err| format_err!("error creating directory {:?}: {}", destination, err))?;
|
|
|
|
|
|
|
|
let rootdir = Dir::open(
|
|
|
|
&destination,
|
|
|
|
OFlag::O_DIRECTORY | OFlag::O_CLOEXEC,
|
|
|
|
Mode::empty(),
|
|
|
|
)
|
|
|
|
.map_err(|err| {
|
|
|
|
format_err!("unable to open target directory {:?}: {}", destination, err,)
|
|
|
|
})?;
|
|
|
|
|
|
|
|
let mut dir_stack = self.new_path_stack();
|
|
|
|
Self::walk_pxar_archive(&self.accessor, &mut dir_stack).await?;
|
|
|
|
let root_meta = dir_stack
|
|
|
|
.last()
|
|
|
|
.unwrap()
|
|
|
|
.pxar
|
|
|
|
.as_ref()
|
|
|
|
.unwrap()
|
|
|
|
.entry()
|
|
|
|
.metadata()
|
|
|
|
.clone();
|
|
|
|
let pxar_dir_stack = PxarDirStack::new(rootdir, root_meta);
|
|
|
|
|
|
|
|
let mut extractor = ExtractorState::new(
|
2020-06-10 09:03:42 +00:00
|
|
|
Flags::DEFAULT,
|
2020-03-23 14:03:18 +00:00
|
|
|
&mut self.catalog,
|
|
|
|
dir_stack,
|
|
|
|
pxar_dir_stack,
|
|
|
|
&match_list,
|
|
|
|
&self.accessor,
|
|
|
|
)?;
|
|
|
|
|
|
|
|
extractor.extract().await
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
enum LoopState {
|
|
|
|
Break,
|
|
|
|
Continue,
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ExtractorState<'a> {
|
|
|
|
path: Vec<u8>,
|
|
|
|
path_len: usize,
|
|
|
|
path_len_stack: Vec<usize>,
|
|
|
|
|
|
|
|
dir_stack: Vec<PathStackEntry>,
|
|
|
|
|
|
|
|
matches: bool,
|
|
|
|
matches_stack: Vec<bool>,
|
|
|
|
|
|
|
|
read_dir: <Vec<catalog::DirEntry> as IntoIterator>::IntoIter,
|
|
|
|
read_dir_stack: Vec<<Vec<catalog::DirEntry> as IntoIterator>::IntoIter>,
|
|
|
|
|
|
|
|
pxar_dir_stack: PxarDirStack,
|
|
|
|
|
|
|
|
catalog: &'a mut CatalogReader,
|
2020-06-10 09:03:42 +00:00
|
|
|
feature_flags: Flags,
|
2020-03-23 14:03:18 +00:00
|
|
|
match_list: &'a [MatchEntry],
|
|
|
|
accessor: &'a Accessor,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> ExtractorState<'a> {
|
|
|
|
pub fn new(
|
2020-06-10 09:03:42 +00:00
|
|
|
feature_flags: Flags,
|
2020-03-23 14:03:18 +00:00
|
|
|
catalog: &'a mut CatalogReader,
|
|
|
|
dir_stack: Vec<PathStackEntry>,
|
|
|
|
pxar_dir_stack: PxarDirStack,
|
|
|
|
match_list: &'a [MatchEntry],
|
|
|
|
accessor: &'a Accessor,
|
|
|
|
) -> Result<Self, Error> {
|
|
|
|
let read_dir = catalog
|
|
|
|
.read_dir(&dir_stack.last().unwrap().catalog)?
|
|
|
|
.into_iter();
|
|
|
|
Ok(Self {
|
|
|
|
path: Vec::new(),
|
|
|
|
path_len: 0,
|
|
|
|
path_len_stack: Vec::new(),
|
|
|
|
|
|
|
|
dir_stack,
|
|
|
|
|
|
|
|
matches: match_list.is_empty(),
|
|
|
|
matches_stack: Vec::new(),
|
|
|
|
|
|
|
|
read_dir,
|
|
|
|
read_dir_stack: Vec::new(),
|
|
|
|
|
|
|
|
pxar_dir_stack,
|
|
|
|
|
|
|
|
catalog,
|
|
|
|
feature_flags,
|
|
|
|
match_list,
|
|
|
|
accessor,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub async fn extract(&mut self) -> Result<(), Error> {
|
|
|
|
loop {
|
|
|
|
let entry = match self.read_dir.next() {
|
|
|
|
Some(entry) => entry,
|
|
|
|
None => match self.handle_end_of_directory()? {
|
|
|
|
LoopState::Break => break, // done with root directory
|
|
|
|
LoopState::Continue => continue,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
self.path.truncate(self.path_len);
|
|
|
|
if !entry.name.starts_with(b"/") {
|
|
|
|
self.path.reserve(entry.name.len() + 1);
|
|
|
|
self.path.push(b'/');
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
self.path.extend(&entry.name);
|
|
|
|
|
|
|
|
self.handle_entry(entry).await?;
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_end_of_directory(&mut self) -> Result<LoopState, Error> {
|
|
|
|
// go up a directory:
|
|
|
|
self.read_dir = match self.read_dir_stack.pop() {
|
|
|
|
Some(r) => r,
|
|
|
|
None => return Ok(LoopState::Break), // out of root directory
|
|
|
|
};
|
|
|
|
|
|
|
|
self.matches = self
|
|
|
|
.matches_stack
|
|
|
|
.pop()
|
|
|
|
.ok_or_else(|| format_err!("internal iterator error (matches_stack)"))?;
|
|
|
|
|
|
|
|
self.dir_stack
|
|
|
|
.pop()
|
|
|
|
.ok_or_else(|| format_err!("internal iterator error (dir_stack)"))?;
|
|
|
|
|
|
|
|
let dir = self
|
|
|
|
.pxar_dir_stack
|
|
|
|
.pop()?
|
|
|
|
.ok_or_else(|| format_err!("internal iterator error (pxar_dir_stack)"))?;
|
|
|
|
|
|
|
|
self.path_len = self
|
|
|
|
.path_len_stack
|
|
|
|
.pop()
|
|
|
|
.ok_or_else(|| format_err!("internal iterator error (path_len_stack)"))?;
|
|
|
|
|
|
|
|
self.path.push(0);
|
|
|
|
let dirname = CStr::from_bytes_with_nul(&self.path[(self.path_len + 1)..])?;
|
|
|
|
|
|
|
|
if let Some(fd) = dir.try_as_raw_fd() {
|
|
|
|
// the directory was created, so apply the metadata:
|
|
|
|
metadata::apply(self.feature_flags, dir.metadata(), fd, dirname)?;
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
|
|
|
|
Ok(LoopState::Continue)
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn handle_new_directory(
|
|
|
|
&mut self,
|
|
|
|
entry: catalog::DirEntry,
|
|
|
|
match_result: Option<MatchType>,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
// enter a new directory:
|
|
|
|
self.read_dir_stack.push(mem::replace(
|
|
|
|
&mut self.read_dir,
|
|
|
|
self.catalog.read_dir(&entry)?.into_iter(),
|
|
|
|
));
|
|
|
|
self.matches_stack.push(self.matches);
|
|
|
|
self.dir_stack.push(PathStackEntry::new(entry));
|
|
|
|
self.path_len_stack.push(self.path_len);
|
|
|
|
self.path_len = self.path.len();
|
|
|
|
|
|
|
|
Shell::walk_pxar_archive(&self.accessor, &mut self.dir_stack).await?;
|
|
|
|
let dir_pxar = self.dir_stack.last().unwrap().pxar.as_ref().unwrap();
|
|
|
|
let dir_meta = dir_pxar.entry().metadata().clone();
|
|
|
|
self.pxar_dir_stack
|
|
|
|
.push(dir_pxar.file_name().to_os_string(), dir_meta)?;
|
|
|
|
|
|
|
|
if self.matches && match_result != Some(MatchType::Exclude) {
|
|
|
|
todo!("create this directory");
|
|
|
|
}
|
|
|
|
|
2020-02-27 16:12:58 +00:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
pub async fn handle_entry(&mut self, entry: catalog::DirEntry) -> Result<(), Error> {
|
|
|
|
let match_result = self.match_list.matches(&self.path, entry.get_file_mode());
|
|
|
|
let did_match = match match_result {
|
|
|
|
Some(MatchType::Include) => true,
|
|
|
|
Some(MatchType::Exclude) => false,
|
|
|
|
None => self.matches,
|
|
|
|
};
|
|
|
|
|
|
|
|
match (did_match, &entry.attr) {
|
|
|
|
(_, DirEntryAttribute::Directory { .. }) => {
|
|
|
|
self.handle_new_directory(entry, match_result).await?;
|
|
|
|
}
|
|
|
|
(true, DirEntryAttribute::File { .. }) => {
|
|
|
|
self.dir_stack.push(PathStackEntry::new(entry));
|
|
|
|
let file = Shell::walk_pxar_archive(&self.accessor, &mut self.dir_stack).await?;
|
|
|
|
self.extract_file(file).await?;
|
|
|
|
self.dir_stack.pop();
|
|
|
|
}
|
|
|
|
(true, DirEntryAttribute::Symlink)
|
|
|
|
| (true, DirEntryAttribute::BlockDevice)
|
|
|
|
| (true, DirEntryAttribute::CharDevice)
|
|
|
|
| (true, DirEntryAttribute::Fifo)
|
|
|
|
| (true, DirEntryAttribute::Socket)
|
|
|
|
| (true, DirEntryAttribute::Hardlink) => {
|
|
|
|
let attr = entry.attr.clone();
|
|
|
|
self.dir_stack.push(PathStackEntry::new(entry));
|
|
|
|
let file = Shell::walk_pxar_archive(&self.accessor, &mut self.dir_stack).await?;
|
|
|
|
self.extract_special(file, attr).await?;
|
|
|
|
self.dir_stack.pop();
|
|
|
|
}
|
|
|
|
(false, _) => (), // skip
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn path(&self) -> &OsStr {
|
|
|
|
OsStr::from_bytes(&self.path)
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn extract_file(&mut self, entry: FileEntry) -> Result<(), Error> {
|
|
|
|
match entry.kind() {
|
|
|
|
pxar::EntryKind::File { size, .. } => {
|
|
|
|
let mut contents = entry.contents().await?;
|
|
|
|
|
|
|
|
let parent = self.pxar_dir_stack.last_dir_fd(true)?;
|
|
|
|
let mut file = tokio::fs::File::from_std(unsafe {
|
|
|
|
std::fs::File::from_raw_fd(nix::fcntl::openat(
|
|
|
|
parent,
|
|
|
|
entry.file_name(),
|
|
|
|
OFlag::O_CREAT | OFlag::O_WRONLY | OFlag::O_CLOEXEC,
|
|
|
|
Mode::from_bits(0o600).unwrap(),
|
|
|
|
)?)
|
|
|
|
});
|
|
|
|
|
|
|
|
let extracted = tokio::io::copy(&mut contents, &mut file).await?;
|
|
|
|
if *size != extracted {
|
|
|
|
bail!("extracted {} bytes of a file of {} bytes", extracted, size);
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
|
|
|
|
metadata::apply_with_path(
|
2020-06-10 09:03:42 +00:00
|
|
|
Flags::DEFAULT,
|
2020-03-23 14:03:18 +00:00
|
|
|
entry.metadata(),
|
|
|
|
file.as_raw_fd(),
|
|
|
|
entry.file_name(),
|
|
|
|
)?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
bail!(
|
|
|
|
"catalog file {:?} not a regular file in the archive",
|
|
|
|
self.path()
|
|
|
|
);
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
async fn extract_special(
|
|
|
|
&mut self,
|
|
|
|
entry: FileEntry,
|
|
|
|
catalog_attr: DirEntryAttribute,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
match (catalog_attr, entry.kind()) {
|
|
|
|
(DirEntryAttribute::Symlink, pxar::EntryKind::Symlink(symlink)) => {
|
|
|
|
self.extract_symlink(entry.file_name(), symlink.as_os_str(), entry.metadata())
|
|
|
|
}
|
|
|
|
(DirEntryAttribute::Symlink, _) => {
|
|
|
|
bail!(
|
|
|
|
"catalog symlink {:?} not a symlink in the archive",
|
|
|
|
self.path()
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
(DirEntryAttribute::Hardlink, pxar::EntryKind::Hardlink(hardlink)) => {
|
|
|
|
self.extract_hardlink(entry.file_name(), hardlink.as_os_str(), entry.metadata())
|
|
|
|
}
|
|
|
|
(DirEntryAttribute::Hardlink, _) => {
|
|
|
|
bail!(
|
|
|
|
"catalog hardlink {:?} not a hardlink in the archive",
|
|
|
|
self.path()
|
|
|
|
);
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
|
|
|
|
(ref attr, pxar::EntryKind::Device(device)) => {
|
|
|
|
self.extract_device(attr.clone(), entry.file_name(), device, entry.metadata())
|
|
|
|
}
|
|
|
|
|
|
|
|
(DirEntryAttribute::Fifo, pxar::EntryKind::Fifo) => {
|
|
|
|
self.extract_node(entry.file_name(), 0, entry.metadata())
|
|
|
|
}
|
|
|
|
(DirEntryAttribute::Fifo, _) => {
|
|
|
|
bail!("catalog fifo {:?} not a fifo in the archive", self.path());
|
|
|
|
}
|
|
|
|
|
|
|
|
(DirEntryAttribute::Socket, pxar::EntryKind::Socket) => {
|
|
|
|
self.extract_node(entry.file_name(), 0, entry.metadata())
|
|
|
|
}
|
|
|
|
(DirEntryAttribute::Socket, _) => {
|
|
|
|
bail!(
|
|
|
|
"catalog socket {:?} not a socket in the archive",
|
|
|
|
self.path()
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
attr => bail!("unhandled file type {:?} for {:?}", attr, self.path()),
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-23 14:03:18 +00:00
|
|
|
fn extract_symlink(
|
|
|
|
&mut self,
|
|
|
|
file_name: &OsStr,
|
|
|
|
target: &OsStr,
|
|
|
|
metadata: &Metadata,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
let parent = self.pxar_dir_stack.last_dir_fd(true)?;
|
|
|
|
nix::unistd::symlinkat(target, Some(parent), file_name)?;
|
|
|
|
|
|
|
|
metadata::apply_at(
|
|
|
|
self.feature_flags,
|
|
|
|
metadata,
|
|
|
|
parent,
|
|
|
|
&CString::new(file_name.as_bytes())?,
|
|
|
|
)?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn extract_hardlink(
|
|
|
|
&mut self,
|
|
|
|
file_name: &OsStr,
|
|
|
|
target: &OsStr,
|
|
|
|
_metadata: &Metadata,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
crate::pxar::tools::assert_relative_path(target)?;
|
|
|
|
|
|
|
|
let parent = self.pxar_dir_stack.last_dir_fd(true)?;
|
|
|
|
let root = self.pxar_dir_stack.root_dir_fd()?;
|
|
|
|
nix::unistd::linkat(
|
|
|
|
Some(root),
|
|
|
|
target,
|
|
|
|
Some(parent),
|
|
|
|
file_name,
|
|
|
|
nix::unistd::LinkatFlags::NoSymlinkFollow,
|
|
|
|
)?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn extract_device(
|
|
|
|
&mut self,
|
|
|
|
attr: DirEntryAttribute,
|
|
|
|
file_name: &OsStr,
|
|
|
|
device: &pxar::format::Device,
|
|
|
|
metadata: &Metadata,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
match attr {
|
|
|
|
DirEntryAttribute::BlockDevice => {
|
|
|
|
if !metadata.stat.is_blockdev() {
|
|
|
|
bail!(
|
|
|
|
"catalog block device {:?} is not a block device in the archive",
|
|
|
|
self.path(),
|
|
|
|
);
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
}
|
|
|
|
DirEntryAttribute::CharDevice => {
|
|
|
|
if !metadata.stat.is_chardev() {
|
|
|
|
bail!(
|
|
|
|
"catalog character device {:?} is not a character device in the archive",
|
|
|
|
self.path(),
|
|
|
|
);
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
_ => {
|
|
|
|
bail!(
|
|
|
|
"unexpected file type for {:?} in the catalog, \
|
|
|
|
which is a device special file in the archive",
|
|
|
|
self.path(),
|
|
|
|
);
|
|
|
|
}
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
2020-03-23 14:03:18 +00:00
|
|
|
self.extract_node(file_name, device.to_dev_t(), metadata)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn extract_node(
|
|
|
|
&mut self,
|
|
|
|
file_name: &OsStr,
|
|
|
|
device: libc::dev_t,
|
|
|
|
metadata: &Metadata,
|
|
|
|
) -> Result<(), Error> {
|
|
|
|
let mode = metadata.stat.mode;
|
|
|
|
let mode = u32::try_from(mode).map_err(|_| {
|
|
|
|
format_err!(
|
|
|
|
"device node's mode contains illegal bits: 0x{:x} (0o{:o})",
|
|
|
|
mode,
|
|
|
|
mode,
|
|
|
|
)
|
|
|
|
})?;
|
|
|
|
|
|
|
|
let parent = self.pxar_dir_stack.last_dir_fd(true)?;
|
|
|
|
let file_name = CString::new(file_name.as_bytes())?;
|
|
|
|
unsafe { c_result!(libc::mknodat(parent, file_name.as_ptr(), mode, device)) }
|
|
|
|
.map_err(|err| format_err!("failed to create device node: {}", err))?;
|
|
|
|
|
|
|
|
metadata::apply_at(self.feature_flags, metadata, parent, &file_name)
|
2020-02-27 16:12:58 +00:00
|
|
|
}
|
|
|
|
}
|