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] fix #7878: reuse manifest on non-encrypting push with matching key
Date: Mon,  3 Aug 2026 12:24:57 +0200	[thread overview]
Message-ID: <20260803102458.371169-1-c.ebner@proxmox.com> (raw)

This fixes a regression for push sync jobs with pre-encrypted
snapshots no longer reusing chunks, even if the previous backup
snapshot was encrypted using the same key.

Previous to commit bb3a5fdfc ("sync: push: gracefully handle previous
manifest signature mismatches") the it was possible to reuse the
manifest of a previous backup snapshot even if not matched by the
key fingerprint. The newly introduced check restricted this, did
however not take into account that for pre-encrypted snapshots the
crypt config on the push is not present, therefore acting like a
regular (non-encrypting) push. In that case, there is no encryption
key with matching fingerprint to check, so the job did not allow to
reuse chunks from that manifest, resulting in prolonged sync runs.

Fix this by also checking the source manifest fingerprint against the
previous snapshot manifest if no server side key is being used and
allow re-using chunks if they did match.

Fixes: bb3a5fdfc ("sync: push: gracefully handle previous manifest signature mismatches")
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 src/server/push.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/server/push.rs b/src/server/push.rs
index 5cc794a68..18f8a6f0f 100644
--- a/src/server/push.rs
+++ b/src/server/push.rs
@@ -1144,6 +1144,18 @@ pub(crate) async fn push_snapshot(
                     if signed_only {
                         return Ok(Arc::new(manifest));
                     }
+
+                    // allow reuse for client side encrypted snapshots with matching key
+                    if let Some(source_key_fp) = source_manifest
+                        .fingerprint()
+                        .context("failed getting fingerprint on source")?
+                    {
+                        if manifest_key_fp == source_key_fp {
+                            return Ok(Arc::new(manifest));
+                        }
+                        bail!("previous snapshot encrypted using different key");
+                    };
+
                     bail!("previous snapshot encrypted but no encryption key configured");
                 };
 
-- 
2.47.3





             reply	other threads:[~2026-08-03 10:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-03 10:24 Christian Ebner [this message]
2026-08-03 12:25 ` applied: [PATCH proxmox-backup] fix #7878: reuse manifest on non-encrypting push with matching key 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=20260803102458.371169-1-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