From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/3] restore daemon: search disk also with truncated serial
Date: Wed, 15 May 2024 11:55:13 +0200 [thread overview]
Message-ID: <20240515095513.1061658-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240515095513.1061658-1-d.csapak@proxmox.com>
the disk serial given to virtio disks only can be 20 characters, so
looking for a disk with a longer serial will always fail (like
'drive-tpmstate0-backup'). If the serial is longer, also try with the
truncated one. Leave the first try in place in case the limit changes.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
.../src/proxmox_restore_daemon/disk.rs | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
index db96ced0b..4991479c2 100644
--- a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
+++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
@@ -634,12 +634,21 @@ impl DiskState {
_ => bail!("no or invalid image in path"),
};
- let buckets = match self.disk_map.get_mut(
- req_fidx
- .strip_suffix(".img.fidx")
- .unwrap_or_else(|| req_fidx.as_ref()),
- ) {
+ let serial = req_fidx
+ .strip_suffix(".img.fidx")
+ .unwrap_or_else(|| req_fidx.as_ref());
+ let buckets = match self.disk_map.get_mut(serial) {
Some(x) => x,
+ None if serial.len() > 20 => {
+ let (truncated_serial, _) = serial.split_at(20);
+ eprintln!(
+ "given image '{req_fidx}' not found with '{serial}', trying with '{truncated_serial}'."
+ );
+ match self.disk_map.get_mut(truncated_serial) {
+ Some(x) => x,
+ None => bail!("given image '{req_fidx}' not found with '{truncated_serial}'"),
+ }
+ }
None => bail!("given image '{req_fidx}' not found"),
};
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-05-15 9:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 9:55 [pbs-devel] [PATCH proxmox-backup 1/3] fix #5465: restore daemon: mount ntfs with utf8 charset Dominik Csapak
2024-05-15 9:55 ` [pbs-devel] [PATCH proxmox-backup 2/3] restore daemon: log some errors for dir traversal Dominik Csapak
2024-05-15 9:55 ` Dominik Csapak [this message]
2024-05-16 10:04 ` [pbs-devel] [PATCH proxmox-backup 3/3] restore daemon: search disk also with truncated serial Fabian Grünbichler
2024-05-16 9:51 ` [pbs-devel] applied-series: [PATCH proxmox-backup 1/3] fix #5465: restore daemon: mount ntfs with utf8 charset 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=20240515095513.1061658-3-d.csapak@proxmox.com \
--to=d.csapak@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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal