From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH container v4 20/41] restore: decide by the reservation whether the container is new
Date: Thu, 19 Nov 2026 11:34:06 +0100 [thread overview]
Message-ID: <20261119103551.1666964-21-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20261119103551.1666964-1-t.lamprecht@proxmox.com>
A container can get removed after the checks of the API call, but before
the VMID is reserved. The reservation then creates a new config. The
restore still treated the container as an existing one, because it
decided that with a check before the reservation. This had two effects.
A restore that failed early only removed the lock and left the new,
empty config behind, which kept the VMID taken. And the 'Sys.Modify'
check for creating a privileged container was skipped.
Use what the reservation found instead. A failed restore then removes
the config that it created, and the 'Sys.Modify' check also applies to a
privileged container that gets created this way.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
changes v3 -> v4:
* new in v4: split out of 'restore: take over the guest uid from the
backup where possible', which did this along the way, with a test of
its own
src/PVE/API2/LXC.pm | 8 ++++----
src/test/lifecycle_tests.pl | 27 +++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index a02fb2c..9997ca8 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -493,7 +493,7 @@ __PACKAGE__->register_method({
# Only overwrite a container that the checks above were done for. The permission to only
# overwrite a container does not cover creating it anew, should it be gone by now.
- eval {
+ my $reservation = eval {
PVE::LXC::Config->create_and_lock_config(
$vmid,
$overwrite_only ? 'require' : $force && $same_container_exists,
@@ -501,7 +501,7 @@ __PACKAGE__->register_method({
};
die "$emsg $@" if $@;
- my $destroy_config_on_error = !$same_container_exists;
+ my $destroy_config_on_error = !$reservation->{existed};
# set once the worker cleans up after a failure on its own
my $started = 0;
@@ -553,7 +553,7 @@ __PACKAGE__->register_method({
# implicit privileged change, or creating a new privileged container is checked here
if (
- (!$same_container_exists || $old_conf->{unprivileged})
+ (!$reservation->{existed} || $old_conf->{unprivileged})
&& !$conf->{unprivileged}
) {
$rpcenv->check($authuser, '/', ['Sys.Modify']);
@@ -718,7 +718,7 @@ __PACKAGE__->register_method({
# container and nothing of it is left, its firewall config gets removed like
# its config. In all other cases, the previous firewall config is put back.
my $firewall_config =
- $same_container_exists && !@left ? undef : $old_firewall_config;
+ $reservation->{existed} && !@left ? undef : $old_firewall_config;
eval { PVE::GuestHelpers::set_firewall_config_raw($vmid, $firewall_config) };
if (my $firewall_err = $@) {
warn "unable to reset the firewall config - $firewall_err";
diff --git a/src/test/lifecycle_tests.pl b/src/test/lifecycle_tests.pl
index b1d185a..0f5aad2 100755
--- a/src/test/lifecycle_tests.pl
+++ b/src/test/lifecycle_tests.pl
@@ -1142,6 +1142,33 @@ subtest 'migration tunnel waits for a volume transfer before it cleans up' => su
ok(defined(read_raw_config(300)), 'reserved config is kept while a transfer still runs');
};
+subtest 'restore treats a container that got removed before the reservation as new' => sub {
+ my $removed_in_between = sub($raw) {
+ reset_state();
+ write_raw_config(200, $raw);
+ $in_between = sub { PVE::LXC::Config->destroy_config(200) };
+ };
+
+ $removed_in_between->(existing_config());
+ $backup_read_error = "unable to read backup\n";
+ like(restore_ct(200, { force => 1 }), qr/unable to read backup/, 'early failure: fails');
+ ok(!defined(read_raw_config(200)), 'early failure: the VMID is released');
+
+ # overwriting a privileged container with a privileged one needs no 'Sys.Modify', creating
+ # one does
+ my $privileged = sub($raw) { return $raw =~ s/^unprivileged: 1\n//mr };
+ $removed_in_between->($privileged->(existing_config()));
+ $backup_raw_config = $privileged->(backup_config());
+ my $deny = { '/' => { 'Sys.Modify' => 1 } };
+ my $err = as_user('user@pve', $deny, sub { restore_ct(200, { force => 1 }) });
+ like(
+ $err,
+ qr/permission check failed \(\/, Sys\.Modify\)/,
+ 'privileged: restore is refused',
+ );
+ ok(!defined(read_raw_config(200)), 'privileged: the VMID is released');
+};
+
remove_tree($WORKDIR);
done_testing();
--
2.47.3
next prev parent reply other threads:[~2026-11-19 10:37 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 10:33 [PATCH cluster/guest-common/qemu-server/container/manager/docs v4 00/41] fix #7846: guest identity (uid) and cluster ID Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 01/41] pmxcfs: reject changes to the cluster ID file from user space Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 02/41] pmxcfs: generate a cluster ID on standalone nodes Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 03/41] pmxcfs: dfsm: add a callback that runs once all members are in sync Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 04/41] pmxcfs: quorum: record the corosync membership Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 05/41] pmxcfs: dcdb: generate the cluster ID once the cluster is in sync Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 06/41] cluster: add helper to read the cluster ID Thomas Lamprecht
2026-11-19 10:33 ` [PATCH cluster v4 07/41] pmxcfs: allow removing the cluster ID file in forced local mode Thomas Lamprecht
2026-11-19 10:33 ` [PATCH guest-common v4 08/41] guest identity: add helpers for the guest uid and registration time Thomas Lamprecht
2026-11-19 10:33 ` [PATCH guest-common v4 09/41] abstract config: assign a guest identity and keep it on config writes Thomas Lamprecht
2026-11-19 10:33 ` [PATCH guest-common v4 10/41] abstract config: let the VMID reservation return the previous state Thomas Lamprecht
2026-11-19 10:33 ` [PATCH guest-common v4 11/41] guest identity: allow adopting a uid that is unused in the cluster Thomas Lamprecht
2026-11-19 10:33 ` [PATCH guest-common v4 12/41] migrate: add shared helpers for the identity command of the migration tunnel Thomas Lamprecht
2026-11-19 10:33 ` [PATCH guest-common v4 13/41] vzdump: notes template: list the uid variable Thomas Lamprecht
2026-11-19 10:34 ` [PATCH qemu-server v4 14/41] api: restore: release the VMID if a restore to an unused VMID fails Thomas Lamprecht
2026-11-19 10:34 ` [PATCH qemu-server v4 15/41] api: migrate, clone: refuse targets that would drop the guest identity Thomas Lamprecht
2026-11-19 10:34 ` [PATCH qemu-server v4 16/41] fix #7846: config: add a guest identity to the 'meta' property Thomas Lamprecht
2026-11-19 10:34 ` [PATCH qemu-server v4 17/41] restore: take over the guest uid from the backup where possible Thomas Lamprecht
2026-11-19 10:34 ` [PATCH qemu-server v4 18/41] api: remote migration: take over the guest uid from the source Thomas Lamprecht
2026-11-19 10:34 ` [PATCH qemu-server v4 19/41] api: status: return the guest uid Thomas Lamprecht
2026-11-19 10:34 ` Thomas Lamprecht [this message]
2026-11-19 10:34 ` [PATCH container v4 21/41] config: add read-only meta property with the creation time Thomas Lamprecht
2026-11-19 10:34 ` [PATCH container v4 22/41] fix #7846: config: add a guest identity to the 'meta' property Thomas Lamprecht
2026-11-19 10:34 ` [PATCH container v4 23/41] api: migrate, clone: refuse targets that would drop the guest identity Thomas Lamprecht
2026-11-19 10:34 ` [PATCH container v4 24/41] restore: take over the guest uid from the backup where possible Thomas Lamprecht
2026-11-19 10:34 ` [PATCH container v4 25/41] restore: refuse overwriting a container with another guest's backup Thomas Lamprecht
2026-11-19 10:34 ` [PATCH container v4 26/41] api: remote migration: take over the guest uid from the source Thomas Lamprecht
2026-11-19 10:34 ` [PATCH container v4 27/41] api: status: return the guest uid Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 28/41] api: cluster resources: add guest uid and registration time Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 29/41] api: cluster status: add cluster ID Thomas Lamprecht
2026-11-19 12:32 ` Lukas Wagner
2026-11-19 12:51 ` Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 30/41] ui: datacenter summary: show the " Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 31/41] ui: restore: allow overwriting a guest with a backup of another guest Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 32/41] ui: migrate: refuse target nodes that would drop the guest identity Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 33/41] ui: guest summary: show " Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 34/41] api: bulk migrate: refuse targets that would drop " Thomas Lamprecht
2026-11-19 10:34 ` [PATCH manager v4 35/41] vzdump: notes template: add the guest uid as variable Thomas Lamprecht
2026-11-19 10:34 ` [PATCH docs v4 36/41] vzdump: restore: describe what a failed restore can leave behind Thomas Lamprecht
2026-11-19 10:34 ` [PATCH docs v4 37/41] vzdump: describe the guest identity of VMs and containers Thomas Lamprecht
2026-11-19 10:34 ` [PATCH docs v4 38/41] pvecm: document the cluster ID and how to get a new one Thomas Lamprecht
2026-11-19 10:34 ` [PATCH docs v4 39/41] qm: configuration: describe the read-only meta property Thomas Lamprecht
2026-11-19 10:34 ` [PATCH docs v4 40/41] pct: " Thomas Lamprecht
2026-11-19 10:34 ` [PATCH docs v4 41/41] vzdump: notes: document the uid template variable Thomas Lamprecht
2026-11-19 14:46 ` [PATCH cluster/guest-common/qemu-server/container/manager/docs v4 00/41] fix #7846: guest identity (uid) and cluster ID Dominik Csapak
2026-11-19 19:49 ` superseded: " 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=20261119103551.1666964-21-t.lamprecht@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=pve-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