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 00DD88AA7C for ; Fri, 19 Aug 2022 12:49:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EAFB1195AA for ; Fri, 19 Aug 2022 12:49:01 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 19 Aug 2022 12:49:00 +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 2125F40C50 for ; Fri, 19 Aug 2022 12:49:00 +0200 (CEST) From: Markus Frank To: pbs-devel@lists.proxmox.com Date: Fri, 19 Aug 2022 12:48:48 +0200 Message-Id: <20220819104848.58076-4-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819104848.58076-1-m.frank@proxmox.com> References: <20220819104848.58076-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.063 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 3/3] proxmox-backup-client: added ignore-acls/xattrs/ownership/permissions & 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: Fri, 19 Aug 2022 10:49:02 -0000 If ignore-acls/ignore-xattrs/ignore-ownership/ignore-permissions is set, the corresponding flag gets removed. overwrite is saved as an PxarExtractOption like allow-existing-dirs. Signed-off-by: Markus Frank --- v3: * renamed parameters to plural form and changed to function parameters * renamed overwrite-existing-files to overwrite v2: added ignore-permissions proxmox-backup-client/src/main.rs | 61 +++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 4bb9aa5e..042802b4 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -1188,6 +1188,7 @@ We do not extract '.pxar' archives when writing to standard output. type: Boolean, description: "Do not fail if directories already exists.", optional: true, + default: false, }, keyfile: { schema: KEYFILE_SCHEMA, @@ -1201,15 +1202,51 @@ We do not extract '.pxar' archives when writing to standard output. type: CryptMode, optional: true, }, + "ignore-acls": { + type: Boolean, + description: "ignore acl settings", + optional: true, + default: false, + }, + "ignore-xattrs": { + type: Boolean, + description: "ignore xattr settings", + optional: true, + default: false, + }, + "ignore-ownership": { + type: Boolean, + description: "ignore owner settings (no chown)", + optional: true, + default: false, + }, + "ignore-permissions": { + type: Boolean, + description: "ignore permission settings (no chmod)", + optional: true, + default: false, + }, + "overwrite": { + type: Boolean, + description: "overwrite already existing files", + optional: true, + default: false, + }, } } )] /// Restore backup repository. -async fn restore(param: Value) -> Result { +async fn restore( + param: Value, + allow_existing_dirs: bool, + ignore_acls: bool, + ignore_xattrs: bool, + ignore_ownership: bool, + ignore_permissions: bool, + overwrite: bool + ) -> Result { let repo = extract_repository_from_value(¶m)?; - let allow_existing_dirs = param["allow-existing-dirs"].as_bool().unwrap_or(false); - let archive_name = json::required_string_param(¶m, "archive-name")?; let rate = match param["rate"].as_str() { @@ -1331,14 +1368,30 @@ async fn restore(param: Value) -> Result { match_list: &[], extract_match_default: true, allow_existing_dirs, + overwrite, 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_xattrs { + feature_flags.remove(pbs_client::pxar::Flags::WITH_XATTRS); + } + if ignore_ownership { + feature_flags.remove(pbs_client::pxar::Flags::WITH_OWNER); + } + if ignore_permissions { + 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