mirror of
git://git.proxmox.com/git/pxar.git
synced 2025-01-08 01:17:40 +03:00
ea8ff6368b
Hardlink targets are now compared, but only the parts we also actually decode, not the chosen names in `Entry.link_key`. This way we can just `==` compare entries as long as the files we use for hardlinking use their canonical path as key. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
265 lines
9.1 KiB
Rust
265 lines
9.1 KiB
Rust
use std::collections::HashMap;
|
|
use std::io::Read;
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use anyhow::{bail, format_err, Error};
|
|
|
|
use pxar::decoder::sync as decoder;
|
|
use pxar::decoder::SeqRead;
|
|
use pxar::encoder::sync as encoder;
|
|
use pxar::encoder::{LinkOffset, SeqWrite};
|
|
use pxar::format::{self, mode};
|
|
use pxar::EntryKind as PxarEntryKind;
|
|
use pxar::Metadata;
|
|
|
|
pub struct HardlinkInfo {
|
|
link: LinkOffset,
|
|
path: PathBuf,
|
|
}
|
|
|
|
pub type HardlinkList = HashMap<String, HardlinkInfo>;
|
|
|
|
#[derive(Debug, Eq, PartialEq)]
|
|
pub enum EntryKind {
|
|
Invalid,
|
|
File(Vec<u8>),
|
|
Directory(Vec<Entry>),
|
|
Symlink(PathBuf),
|
|
Hardlink(String),
|
|
Device(format::Device),
|
|
Socket,
|
|
Fifo,
|
|
}
|
|
|
|
#[derive(Debug, Eq)]
|
|
pub struct Entry {
|
|
pub name: String,
|
|
pub metadata: Metadata,
|
|
pub entry: EntryKind,
|
|
pub link_key: Option<String>,
|
|
}
|
|
|
|
impl PartialEq for Entry {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
// When decoding we don't get hardlink names back, so we skip those in our eq check.
|
|
self.name == other.name && self.metadata == other.metadata && self.entry == other.entry
|
|
}
|
|
}
|
|
|
|
impl Entry {
|
|
pub fn new(name: &str) -> Self {
|
|
Self {
|
|
name: name.to_string(),
|
|
metadata: Metadata::default(),
|
|
entry: EntryKind::Invalid,
|
|
link_key: None,
|
|
}
|
|
}
|
|
|
|
pub fn metadata(mut self, metadata: impl Into<Metadata>) -> Self {
|
|
self.metadata = metadata.into();
|
|
self
|
|
}
|
|
|
|
pub fn entry(mut self, entry: EntryKind) -> Self {
|
|
self.entry = entry;
|
|
self
|
|
}
|
|
|
|
/// NOTE: For test cases to be equal via the `==` comparison link keys must be equal to the full
|
|
/// canonical path, as decoded hardlinks will use the `entry.path()` from the pxar decoder as
|
|
/// value for `EntryKind::Hardlink`.
|
|
pub fn link_key(mut self, key: impl Into<String>) -> Self {
|
|
self.link_key = Some(key.into());
|
|
self
|
|
}
|
|
|
|
fn no_hardlink(&self) -> Result<(), Error> {
|
|
if let Some(key) = &self.link_key {
|
|
bail!(
|
|
"hardlink key on entry which may not be hard-linked: {}",
|
|
key
|
|
);
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub fn encode_into<T>(
|
|
&self,
|
|
encoder: &mut encoder::Encoder<T>,
|
|
hardlinks: &mut HardlinkList,
|
|
path: &Path,
|
|
) -> Result<(), Error>
|
|
where
|
|
T: SeqWrite,
|
|
{
|
|
match &self.entry {
|
|
EntryKind::Invalid => bail!("invalid entry encountered"),
|
|
|
|
EntryKind::File(data) => {
|
|
let link: LinkOffset = encoder.add_file(
|
|
&self.metadata,
|
|
&self.name,
|
|
data.len() as u64,
|
|
&mut &data[..],
|
|
)?;
|
|
if let Some(key) = &self.link_key {
|
|
let info = HardlinkInfo {
|
|
link,
|
|
path: path.join(&self.name),
|
|
};
|
|
if hardlinks.insert(key.clone(), info).is_some() {
|
|
bail!("duplicate hardlink key: {}", key);
|
|
}
|
|
}
|
|
}
|
|
|
|
EntryKind::Directory(entries) => {
|
|
self.no_hardlink()?;
|
|
let mut dir = encoder.create_directory(&self.name, &self.metadata)?;
|
|
let path = path.join(&self.name);
|
|
for entry in entries {
|
|
entry.encode_into(&mut dir, hardlinks, &path)?;
|
|
}
|
|
dir.finish()?;
|
|
}
|
|
|
|
EntryKind::Symlink(path) => {
|
|
self.no_hardlink()?;
|
|
let _: () = encoder.add_symlink(&self.metadata, &self.name, path)?;
|
|
}
|
|
|
|
EntryKind::Hardlink(key) => {
|
|
self.no_hardlink()?;
|
|
if let Some(info) = hardlinks.get(key) {
|
|
let _: () = encoder.add_hardlink(&self.name, &info.path, info.link)?;
|
|
} else {
|
|
bail!("missing hardlink target key: {}", key);
|
|
}
|
|
}
|
|
|
|
other => bail!("TODO: encode_entry for {:?}", other),
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub fn decode_from<T: SeqRead>(decoder: &mut decoder::Decoder<T>) -> Result<Entry, Error> {
|
|
decoder.enable_goodbye_entries(true);
|
|
Self::decode_root(decoder)
|
|
}
|
|
|
|
fn decode_root<T: SeqRead>(decoder: &mut decoder::Decoder<T>) -> Result<Entry, Error> {
|
|
let item = decoder
|
|
.next()
|
|
.ok_or_else(|| format_err!("empty archive?"))??;
|
|
|
|
match item.kind() {
|
|
PxarEntryKind::Directory => (),
|
|
other => bail!("invalid entry kind for root node: {:?}", other),
|
|
}
|
|
|
|
let mut root = Entry::new("/").metadata(item.metadata().clone());
|
|
root.decode_directory(decoder)?;
|
|
Ok(root)
|
|
}
|
|
|
|
fn decode_directory<T: SeqRead>(
|
|
&mut self,
|
|
decoder: &mut decoder::Decoder<T>,
|
|
) -> Result<(), Error> {
|
|
let mut contents = Vec::new();
|
|
|
|
while let Some(item) = decoder.next().transpose()? {
|
|
let make_entry =
|
|
|| -> Result<Entry, Error> {
|
|
Ok(Entry::new(item.file_name().to_str().ok_or_else(|| {
|
|
format_err!("non-utf8 name in test: {:?}", item.file_name())
|
|
})?)
|
|
.metadata(item.metadata().clone())
|
|
.link_key(item.path().as_os_str().to_str().ok_or_else(|| {
|
|
format_err!("non-utf8 path in test: {:?}", item.file_name())
|
|
})?))
|
|
};
|
|
match item.kind() {
|
|
PxarEntryKind::GoodbyeTable => break,
|
|
PxarEntryKind::File { size, .. } => {
|
|
let mut data = Vec::new();
|
|
decoder
|
|
.contents()
|
|
.ok_or_else(|| {
|
|
format_err!("failed to get contents for file entry: {:?}", item.path())
|
|
})?
|
|
.read_to_end(&mut data)?;
|
|
contents.push(make_entry()?.entry(EntryKind::File(data)));
|
|
}
|
|
PxarEntryKind::Directory => {
|
|
let mut dir = make_entry()?;
|
|
dir.decode_directory(decoder)?;
|
|
contents.push(dir);
|
|
}
|
|
PxarEntryKind::Symlink(link) => {
|
|
contents.push(make_entry()?.entry(EntryKind::Symlink(link.into())));
|
|
}
|
|
PxarEntryKind::Hardlink(link) => {
|
|
contents.push(
|
|
make_entry()?.entry(EntryKind::Hardlink(
|
|
link.as_os_str()
|
|
.to_str()
|
|
.ok_or_else(|| {
|
|
format_err!("non-utf8 hardlink entry: {:?}", link.as_os_str())
|
|
})?
|
|
.to_string(),
|
|
)),
|
|
);
|
|
}
|
|
other => todo!("pxar kind {:?}", other),
|
|
}
|
|
}
|
|
|
|
self.entry = EntryKind::Directory(contents);
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[rustfmt::skip]
|
|
pub fn test_fs() -> Entry {
|
|
Entry::new("/")
|
|
.metadata(Metadata::dir_builder(0o755))
|
|
.entry(EntryKind::Directory(vec![
|
|
Entry::new("home")
|
|
.metadata(Metadata::dir_builder(0o755))
|
|
.entry(EntryKind::Directory(vec![
|
|
Entry::new("user")
|
|
.metadata(Metadata::dir_builder(0o700).owner(1000, 1000))
|
|
.entry(EntryKind::Directory(vec![
|
|
Entry::new(".profile")
|
|
.metadata(Metadata::file_builder(0o644).owner(1000, 1000))
|
|
.entry(EntryKind::File(b"#umask 022".to_vec())),
|
|
Entry::new("data")
|
|
.metadata(Metadata::file_builder(0o644).owner(1000, 1000))
|
|
.entry(EntryKind::File(b"a file from a user".to_vec())),
|
|
])),
|
|
])),
|
|
Entry::new("bin")
|
|
.metadata(Metadata::builder(mode::IFLNK | 0o777))
|
|
.entry(EntryKind::Symlink(PathBuf::from("usr/bin"))),
|
|
Entry::new("usr")
|
|
.metadata(Metadata::dir_builder(0o755))
|
|
.entry(EntryKind::Directory(vec![
|
|
Entry::new("bin")
|
|
.metadata(Metadata::dir_builder(0o755))
|
|
.entry(EntryKind::Directory(vec![
|
|
Entry::new("bzip2")
|
|
.metadata(Metadata::file_builder(0o755))
|
|
.entry(EntryKind::File(b"This is an executable".to_vec()))
|
|
.link_key("/usr/bin/bzip2"),
|
|
Entry::new("cat")
|
|
.metadata(Metadata::file_builder(0o755))
|
|
.entry(EntryKind::File(b"This is another executable".to_vec())),
|
|
Entry::new("bunzip2")
|
|
.entry(EntryKind::Hardlink("/usr/bin/bzip2".to_string())),
|
|
])),
|
|
])),
|
|
]))
|
|
}
|