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 E3FA31FF137 for ; Tue, 14 Apr 2026 14:59:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C460182F1; Tue, 14 Apr 2026 14:59:49 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v3 17/30] sync: push: optionally encrypt client log on upload if key is given Date: Tue, 14 Apr 2026 14:59:10 +0200 Message-ID: <20260414125923.892345-18-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260414125923.892345-1-c.ebner@proxmox.com> References: <20260414125923.892345-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776171500729 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.070 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 Message-ID-Hash: CXIMZTWY7CDV2O4GOH57UC6QV43DSHQ6 X-Message-ID-Hash: CXIMZTWY7CDV2O4GOH57UC6QV43DSHQ6 X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Encrypt the client log blob with given encryption key during syncs in push direction, if given. The client log is not part of the manifest and therefore needs to be handled separately. Signed-off-by: Christian Ebner --- changes since version 2: - no changes src/server/push.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/server/push.rs b/src/server/push.rs index 75f92b291..a848c989c 100644 --- a/src/server/push.rs +++ b/src/server/push.rs @@ -1020,13 +1020,23 @@ pub(crate) async fn push_snapshot( let client_log_name = &CLIENT_LOG_BLOB_NAME; client_log_path.push(client_log_name.as_ref()); if client_log_path.is_file() { - backup_writer - .upload_blob_from_file( - &client_log_path, - client_log_name.as_ref(), - upload_options.clone(), + if encrypt_using_key.is_some() { + reencode_encrypted_and_upload_blob( + client_log_path, + client_log_name, + &backup_writer, + &upload_options, ) .await?; + } else { + backup_writer + .upload_blob_from_file( + &client_log_path, + client_log_name.as_ref(), + upload_options.clone(), + ) + .await?; + } } // Rewrite manifest for pushed snapshot, recreating manifest from source on target, -- 2.47.3