public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup 1/2] client: allow skipping signature check on previous manifest fetching
Date: Wed, 29 Apr 2026 11:28:46 +0200	[thread overview]
Message-ID: <20260429092847.381438-2-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260429092847.381438-1-c.ebner@proxmox.com>

Extends the BackupWriter implementation by a method which allows to
download the previous manifest from a PBS instance, but skipping the
signature check even if the backup writer has a crypt_config set.

This will be used to silence misleading logs during encrypting push
sync jobs, by performing the signature check on the call site
instead.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-client/src/backup_writer.rs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs
index 49aff3fdd..ea990dbde 100644
--- a/pbs-client/src/backup_writer.rs
+++ b/pbs-client/src/backup_writer.rs
@@ -735,8 +735,25 @@ impl BackupWriter {
         })
     }
 
-    /// Download backup manifest (index.json) of last backup
+    /// Download backup manifest (index.json) of last backup, checking the signature
+    /// using the backup writer's crypt config.
     pub async fn download_previous_manifest(&self) -> Result<BackupManifest, Error> {
+        let manifest = self
+            .download_previous_manifest_without_signature_check()
+            .await?;
+
+        if let Some(crypt_config) = &self.crypt_config {
+            manifest.check_signature(crypt_config)?;
+        }
+
+        Ok(manifest)
+    }
+
+    /// Download backup manifest (index.json) of last backup, but skips the signature
+    /// check by not providing the crypt config when parsing the manifest from the data blob.
+    pub async fn download_previous_manifest_without_signature_check(
+        &self,
+    ) -> Result<BackupManifest, Error> {
         let mut raw_data = Vec::with_capacity(64 * 1024);
 
         let param = json!({ "archive-name": MANIFEST_BLOB_NAME.to_string() });
@@ -748,8 +765,7 @@ impl BackupWriter {
         // no expected digest available
         let data = blob.decode(self.crypt_config.as_ref().map(Arc::as_ref), None)?;
 
-        let manifest =
-            BackupManifest::from_data(&data[..], self.crypt_config.as_ref().map(Arc::as_ref))?;
+        let manifest = BackupManifest::from_data(&data[..], None)?;
 
         Ok(manifest)
     }
-- 
2.47.3





  reply	other threads:[~2026-04-29  9:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-29  9:28 [PATCH proxmox-backup 0/2] gracefully handle signature mismatch from previous manifest load during encrypting push sync Christian Ebner
2026-04-29  9:28 ` Christian Ebner [this message]
2026-04-29 11:43   ` [PATCH proxmox-backup 1/2] client: allow skipping signature check on previous manifest fetching Fabian Grünbichler
2026-04-29 11:52     ` Christian Ebner
2026-04-29  9:28 ` [PATCH proxmox-backup 2/2] sync: push: gracefully handle previous manifest signature mismatches Christian Ebner
2026-04-29 11:43   ` Fabian Grünbichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260429092847.381438-2-c.ebner@proxmox.com \
    --to=c.ebner@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal