From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup] pull: decrypt: set and check change-detection-fingerprint
Date: Tue, 28 Apr 2026 11:44:17 +0200 [thread overview]
Message-ID: <20260428094437.596604-1-f.gruenbichler@proxmox.com> (raw)
when decrypt-pulling a snapshot that was not created by encrypt-pushing, but by
a regular encrypted backup, resyncing requires matching the local plain text
manifest and the remote encrypted one.
in addition to storing a signature of the plain manifest when encrypt-pushing,
store the already existing signature of the encrypted source manifest when
decrypt-pulling, but only use it for matching if the former does not exist.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/server/pull.rs | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index 4a41ea7da..c519ed5d8 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -21,8 +21,8 @@ use tokio::io::AsyncWriteExt;
use pbs_api_types::{
print_store_and_ns, ArchiveType, Authid, BackupArchiveName, BackupDir, BackupGroup,
- BackupNamespace, CryptMode, GroupFilter, Operation, RateLimitConfig, Remote, SnapshotListItem,
- VerifyState, CLIENT_LOG_BLOB_NAME, MANIFEST_BLOB_NAME, MAX_NAMESPACE_DEPTH,
+ BackupNamespace, CryptMode, Fingerprint, GroupFilter, Operation, RateLimitConfig, Remote,
+ SnapshotListItem, VerifyState, CLIENT_LOG_BLOB_NAME, MANIFEST_BLOB_NAME, MAX_NAMESPACE_DEPTH,
PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP,
};
use pbs_client::BackupRepository;
@@ -878,6 +878,11 @@ async fn pull_snapshot<'a>(
bail!("Encountered unexpected manifest without 'unprotected' section.");
}
+ if let Some(expected) = &manifest.signature {
+ let expected: Fingerprint = expected.parse().with_context(|| prefix.clone())?;
+ new_manifest.set_change_detection_fingerprint(expected.bytes())?;
+ }
+
let manifest_string = new_manifest.to_string(None)?;
let manifest_blob = DataBlob::encode(manifest_string.as_bytes(), None, true)?;
// update contents to be uploaded to backend
@@ -1021,6 +1026,20 @@ async fn optionally_use_decryption_key(
} else {
bail!("Change detection fingerprint mismatch, refuse to continue!");
}
+ } else if let Some(source_signature) = existing_manifest
+ .get_change_detection_fingerprint()
+ .context("failed to parse change detection fingerprint of existing target manifest")
+ .with_context(|| prefix.clone())?
+ {
+ let Some(expected) = &manifest.signature else {
+ bail!("No signature on source manifest.");
+ };
+ let expected: Fingerprint = expected.parse().with_context(|| prefix.clone())?;
+ if expected == source_signature {
+ skip_resync = true;
+ } else {
+ bail!("Change detection fingerprint mismatch, refuse to continue!");
+ }
} else {
bail!("No change detection fingerprint found, refuse to continue!");
}
--
2.47.3
next reply other threads:[~2026-04-28 9:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-28 9:44 Fabian Grünbichler [this message]
2026-04-28 10:01 ` [PATCH proxmox-backup] pull: decrypt: set and check change-detection-fingerprint Dominik Csapak
2026-04-28 12:56 ` Christian Ebner
2026-04-28 13:07 ` applied: " Thomas Lamprecht
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=20260428094437.596604-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.