From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CB9A990607 for ; Wed, 24 Jan 2024 11:15:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B38E79F8D for ; Wed, 24 Jan 2024 11:15:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 24 Jan 2024 11:15:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BDCC449266 for ; Wed, 24 Jan 2024 11:15:28 +0100 (CET) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Wed, 24 Jan 2024 11:15:16 +0100 Message-Id: <20240124101519.30079-3-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240124101519.30079-1-f.schauer@proxmox.com> References: <20240124101519.30079-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.129 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 - Subject: [pbs-devel] [PATCH v4 proxmox 2/3] compression: Add support for symlinks in zip files 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: , X-List-Received-Date: Wed, 24 Jan 2024 10:15:29 -0000 Signed-off-by: Filip Schauer --- proxmox-compression/src/zip.rs | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/proxmox-compression/src/zip.rs b/proxmox-compression/src/zip.rs index 6229990..aec11a4 100644 --- a/proxmox-compression/src/zip.rs +++ b/proxmox-compression/src/zip.rs @@ -17,7 +17,7 @@ use std::time::SystemTime; use anyhow::{format_err, Error, Result}; use endian_trait::Endian; use futures::ready; -use libc::{S_IFDIR, S_IFREG}; +use libc::{S_IFDIR, S_IFLNK, S_IFREG}; use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadBuf}; use crc32fast::Hasher; @@ -75,6 +75,7 @@ fn epoch_to_dos(epoch: i64) -> (u16, u16) { pub enum FileType { Directory, Regular(R), + Symlink(OsString), } impl FileType { @@ -82,6 +83,12 @@ impl FileType { match self { FileType::Directory => None, FileType::Regular(content) => Some(HashWrapper::new(content)), + FileType::Symlink(symlink_target) => { + let cursor = std::io::Cursor::new(symlink_target.as_bytes()); + let reader_box = Box::new(cursor) as Box; + let leaked_ref = Box::leak(reader_box); + Some(HashWrapper::new(leaked_ref)) + } } } } @@ -247,6 +254,7 @@ impl ZipEntry { let file_type_attr = match file_type { FileType::Regular(_) => S_IFREG, FileType::Directory => S_IFDIR, + FileType::Symlink(_) => S_IFLNK, }; Self { @@ -699,6 +707,16 @@ where FileType::<&[u8]>::Directory, ) .await?; + } else if entry.file_type().is_symlink() { + let target = std::fs::read_link(entry.path())?; + encoder + .add_entry( + entry_path_no_base, + mtime, + mode, + FileType::>::Symlink(target.into()), + ) + .await?; } } -- 2.39.2