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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AD2588A7C3 for ; Thu, 18 Aug 2022 13:07:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A806E2FDCF for ; Thu, 18 Aug 2022 13:07:16 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 18 Aug 2022 13:07:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AE62144BC9 for ; Thu, 18 Aug 2022 13:07:08 +0200 (CEST) From: Markus Frank To: pbs-devel@lists.proxmox.com Date: Thu, 18 Aug 2022 13:06:54 +0200 Message-Id: <20220818110654.56988-4-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220818110654.56988-1-m.frank@proxmox.com> References: <20220818110654.56988-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.080 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 proxmox-backup v2 3/3] proxmox-backup-client: added ignore-acl/xattr/ownership/permission & overwrite parameters 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: Thu, 18 Aug 2022 11:07:16 -0000 If ignore-acl/ignore-xattr/ignore-ownership/ignore-permission is set, the corresponding flag gets removed. overwrite-existing-files is saved as an PxarExtractOption like allow-existing-dirs. Signed-off-by: Markus Frank --- v2: added ignore-permission proxmox-backup-client/src/main.rs | 49 ++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 4bb9aa5e..dc038864 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -1201,6 +1201,31 @@ We do not extract '.pxar' archives when writing to standard output. type: CryptMode, optional: true, }, + "ignore-acl": { + type: Boolean, + description: "ignore acl settings", + optional: true, + }, + "ignore-xattr": { + type: Boolean, + description: "ignore xattr settings", + optional: true, + }, + "ignore-ownership": { + type: Boolean, + description: "ignore owner settings (no chown)", + optional: true, + }, + "ignore-permission": { + type: Boolean, + description: "ignore permission settings (no chmod)", + optional: true, + }, + "overwrite-existing-files": { + type: Boolean, + description: "overwrite already existing files", + optional: true, + }, } } )] @@ -1210,6 +1235,12 @@ async fn restore(param: Value) -> Result { let allow_existing_dirs = param["allow-existing-dirs"].as_bool().unwrap_or(false); + let ignore_acls = param["ignore-acl"].as_bool().unwrap_or(false); + let ignore_xattr = param["ignore-xattr"].as_bool().unwrap_or(false); + let ignore_ownership = param["ignore-ownership"].as_bool().unwrap_or(false); + let ignore_permission = param["ignore-permission"].as_bool().unwrap_or(false); + let overwrite_existing_files = param["overwrite-existing-files"].as_bool().unwrap_or(false); + let archive_name = json::required_string_param(¶m, "archive-name")?; let rate = match param["rate"].as_str() { @@ -1331,14 +1362,30 @@ async fn restore(param: Value) -> Result { match_list: &[], extract_match_default: true, allow_existing_dirs, + overwrite_existing_files, on_error: None, }; + let mut feature_flags = pbs_client::pxar::Flags::DEFAULT; + + if ignore_acls { + feature_flags.remove(pbs_client::pxar::Flags::WITH_ACL); + } + if ignore_xattr { + feature_flags.remove(pbs_client::pxar::Flags::WITH_XATTRS); + } + if ignore_ownership { + feature_flags.remove(pbs_client::pxar::Flags::WITH_OWNER); + } + if ignore_permission { + feature_flags.remove(pbs_client::pxar::Flags::WITH_PERMISSIONS); + } + if let Some(target) = target { pbs_client::pxar::extract_archive( pxar::decoder::Decoder::from_std(reader)?, Path::new(target), - pbs_client::pxar::Flags::DEFAULT, + feature_flags, |path| { log::debug!("{:?}", path); }, -- 2.30.2