From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 990931FF391 for ; Wed, 12 Jun 2024 10:23:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 57E78AD40; Wed, 12 Jun 2024 10:24:28 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 12 Jun 2024 10:23:56 +0200 Message-Id: <20240612082400.110789-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240612082400.110789-1-c.ebner@proxmox.com> References: <20240612082400.110789-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [PATCH v3 pxar 2/6] format: add helper for payload header consistency checks X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" The helper method will be used to check the payload header being consistent with what was encoded as paylaod reference for split pxar archives. Signed-off-by: Christian Ebner --- changes since version 2: - limit to be pub(crate) src/format/mod.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/format/mod.rs b/src/format/mod.rs index 59d40e1..0648924 100644 --- a/src/format/mod.rs +++ b/src/format/mod.rs @@ -823,3 +823,24 @@ pub fn check_file_name(path: &Path) -> io::Result<()> { Ok(()) } } + +/// Check if provided header is of type payload and the headers content size matches given size. +/// +/// Returns an [`io::Error`](std::io::Error) of type [`Other`](std::io::ErrorKind::Other) if that's +/// not the case. +pub(crate) fn check_payload_header_and_size(header: &Header, size: u64) -> io::Result<()> { + header.check_header_size()?; + + if header.htype != PXAR_PAYLOAD { + io_bail!("unexpected header: expected {PXAR_PAYLOAD:x?} , got {header:x?}"); + } + + if header.content_size() != size { + io_bail!( + "encountered size mismatch: expected {}, got {size}", + header.content_size() + ); + } + + Ok(()) +} -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel