Proxmox/pxar
5
0
Fork 0
mirror of git://git.proxmox.com/git/pxar.git synced 2025-03-19 22:50:36 +03:00
Code Releases Activity

format/decoder/accessor: backport PXAR_FORMAT_VERSION header

Browse Source 
Backports the PXAR_FORMAT_VERSION header, introduced with version
0.11 of the pxar library in order to early bail for decoder and
accessor instances not supporting the updated pxar format version.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2024-06-06 12:32:56 +02:00 committed by Fabian Grünbichler
parent a319ee6d76
commit 69c8f2305e
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/mk-format-hashes.rs
View File

@ -1,6 +1,11 @@
use pxar::format::hash_filename;
const CONSTANTS: &[(&str, &str, &str)] = &[
(
"Pxar format version entry, fallback to version 1 if not present",
"PXAR_FORMAT_VERSION",
"__PROXMOX_FORMAT_VERSION__",
),
(
"Beginning of an entry (current version).",
"PXAR_ENTRY",

12
src/accessor/mod.rs
View File

@ -190,6 +190,18 @@ impl<T: ReadAt> AccessorImpl<T> {
io_bail!("too small to contain a pxar archive");
}
let header: format::Header = read_entry_at(&input, 0).await?;
header.check_header_size()?;
if header.htype == format::PXAR_FORMAT_VERSION {
let version: u64 = read_entry_at(
&input,
size_of::<format::Header>() as u64,
)
.await?;
io_bail!("format version {version} not compatible with this client");
}
Ok(Self {
input,
size,

3
src/decoder/mod.rs
View File

@ -374,6 +374,9 @@ impl<I: SeqRead> DecoderImpl<I> {
self.entry.kind = EntryKind::Hardlink(self.read_hardlink().await?);
Ok(Some(self.entry.take()))
} else if header.htype == format::PXAR_FORMAT_VERSION {
let version: u64 = seq_read_entry(&mut self.input).await?;
io_bail!("format version {version} not compatible with this client");
} else if header.htype == format::PXAR_ENTRY || header.htype == format::PXAR_ENTRY_V1 {
if header.htype == format::PXAR_ENTRY {
self.entry.metadata = Metadata {

4
src/format/mod.rs
View File

@ -6,6 +6,7 @@
//! item data.
//!
//! An archive contains items in the following order:
//! * `FORMAT_VERSION` -- (optional for v1), version of encoding format
//! * `ENTRY` -- containing general stat() data and related bits
//! * `XATTR` -- one extended attribute
//! * ... -- more of these when there are multiple defined
@ -79,6 +80,8 @@ pub mod mode {
}
// Generated by `cargo run --example mk-format-hashes`
/// Pxar format version entry, fallback to version 1 if not present
pub const PXAR_FORMAT_VERSION: u64 = 0x730f6c75df16a40d;
/// Beginning of an entry (current version).
pub const PXAR_ENTRY: u64 = 0xd5956474e588acef;
/// Previous version of the entry struct
@ -177,6 +180,7 @@ impl Header {
impl Display for Header {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let readable = match self.htype {
PXAR_FORMAT_VERSION => "FORMAT_VERSION",
PXAR_FILENAME => "FILENAME",
PXAR_SYMLINK => "SYMLINK",
PXAR_HARDLINK => "HARDLINK",