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 D8CFE1FF137 for ; Tue, 14 Apr 2026 15:07:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A65F19524; Tue, 14 Apr 2026 15:08:41 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v3 26/30] sync: pull: decrypt blob files on pull if encryption key is configured Date: Tue, 14 Apr 2026 14:59:19 +0200 Message-ID: <20260414125923.892345-27-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: 1776171502836 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pull.rs] Message-ID-Hash: DHKHZCQP3S4V6RUSE775JI4HSIE3L3RK X-Message-ID-Hash: DHKHZCQP3S4V6RUSE775JI4HSIE3L3RK 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: During pull, blob files are stored in a temporary file before being renamed to the actual blob filename as stored in the manifest. If a decryption key is configured in the pull parameters, use the decrypted temporary blob file after downloading it from the remote to decrypt it and re-encode as new compressed but unencrypted blob file. Rename the decrypted tempfile to be the new tmpfile to be finally moved in place. Signed-off-by: Christian Ebner --- changes since version 2: - squash new manifest registration into this patch src/server/pull.rs | 63 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index 61880183a..75958d625 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -2,7 +2,8 @@ use std::collections::hash_map::Entry; use std::collections::{HashMap, HashSet}; -use std::io::Seek; +use std::io::{BufReader, Read, Seek, Write}; +use std::os::fd::AsRawFd; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex}; use std::time::SystemTime; @@ -14,7 +15,7 @@ use tracing::{info, warn}; use pbs_api_types::{ print_store_and_ns, ArchiveType, Authid, BackupArchiveName, BackupDir, BackupGroup, - BackupNamespace, GroupFilter, Operation, RateLimitConfig, Remote, SnapshotListItem, + BackupNamespace, CryptMode, GroupFilter, Operation, RateLimitConfig, Remote, SnapshotListItem, VerifyState, CLIENT_LOG_BLOB_NAME, MANIFEST_BLOB_NAME, MAX_NAMESPACE_DEPTH, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, }; @@ -26,7 +27,9 @@ use pbs_datastore::fixed_index::{FixedIndexReader, FixedIndexWriter}; use pbs_datastore::index::IndexFile; use pbs_datastore::manifest::{BackupManifest, FileInfo}; use pbs_datastore::read_chunk::AsyncReadChunk; -use pbs_datastore::{check_backup_owner, DataStore, DatastoreBackend, StoreProgress}; +use pbs_datastore::{ + check_backup_owner, DataBlobReader, DataStore, DatastoreBackend, StoreProgress, +}; use pbs_tools::sha::sha256; use super::sync::{ @@ -313,6 +316,7 @@ async fn pull_single_archive<'a>( encountered_chunks: Arc>, crypt_config: Option>, backend: &DatastoreBackend, + new_manifest: Option>>, ) -> Result { let archive_name = &archive_info.filename; let mut path = snapshot.full_path(); @@ -409,6 +413,57 @@ async fn pull_single_archive<'a>( tmpfile.rewind()?; let (csum, size) = sha256(&mut tmpfile)?; verify_archive(archive_info, &csum, size)?; + + if crypt_config.is_some() { + let crypt_config = crypt_config.clone(); + let tmp_path = tmp_path.clone(); + let archive_name = archive_name.clone(); + + tokio::task::spawn_blocking(move || { + // must rewind again since after verifying cursor is at the end of the file + tmpfile.rewind()?; + let reader = DataBlobReader::new(tmpfile, crypt_config)?; + let mut reader = BufReader::new(reader); + let mut raw_data = Vec::new(); + reader.read_to_end(&mut raw_data)?; + + let blob = DataBlob::encode(&raw_data, None, true)?; + let raw_blob = blob.into_inner(); + + let mut decrypted_tmp_path = tmp_path.clone(); + decrypted_tmp_path.set_extension("dectmp"); + let result = proxmox_lang::try_block!({ + let mut decrypted_tmpfile = std::fs::OpenOptions::new() + .read(true) + .write(true) + .create_new(true) + .open(&decrypted_tmp_path)?; + decrypted_tmpfile.write_all(&raw_blob)?; + decrypted_tmpfile.flush()?; + decrypted_tmpfile.rewind()?; + let (csum, size) = sha256(&mut decrypted_tmpfile)?; + + if let Some(new_manifest) = new_manifest { + let mut new_manifest = new_manifest.lock().unwrap(); + let name = archive_name.as_str().try_into()?; + new_manifest.add_file(&name, size, csum, CryptMode::None)?; + } + + nix::unistd::fsync(decrypted_tmpfile.as_raw_fd())?; + + std::fs::rename(&decrypted_tmp_path, &tmp_path)?; + Ok(()) + }); + + if result.is_err() { + let _ = std::fs::remove_file(&decrypted_tmp_path); + } + + result + }) + .await? + .map_err(|err: Error| format_err!("Failed when decrypting blob {path:?}: {err}"))?; + } } } if let Err(err) = std::fs::rename(&tmp_path, &path) { @@ -509,6 +564,7 @@ async fn pull_snapshot<'a>( } let mut crypt_config = None; + let mut new_manifest = None; let backend = ¶ms.target.backend; for item in manifest.files() { @@ -558,6 +614,7 @@ async fn pull_snapshot<'a>( encountered_chunks.clone(), crypt_config.clone(), backend, + new_manifest.clone(), ) .await?; sync_stats.add(stats); -- 2.47.3