From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 5A5511FF0E5 for ; Wed, 29 Jul 2026 16:20:27 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id F38B12132E; Wed, 29 Jul 2026 16:20:26 +0200 (CEST) Message-ID: <2f38582b-6c68-427f-94b7-1eab09dec34e@proxmox.com> Date: Wed, 29 Jul 2026 16:20:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH container v2] fix #7164: lxc: restore: apply password and ssh keys during container restore To: Elias Huhsovitz , pve-devel@lists.proxmox.com References: <20260729082545.17885-1-e.huhsovitz@proxmox.com> Content-Language: en-US From: Erik Fastermann In-Reply-To: <20260729082545.17885-1-e.huhsovitz@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1785334794891 X-SPAM-LEVEL: Spam detection results: 0 AWL 1.016 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: IZZBBVORXZVY676O5CQERMARVJUKPW3E X-Message-ID-Hash: IZZBBVORXZVY676O5CQERMARVJUKPW3E X-MailFrom: e.fastermann@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Thank you for working on this. See my comments below. The commit message is a little long. I would just shorten it to 'fix #7164: restore: apply password and ssh keys', as lxc is obvious since we are in pve-container and 'during container restore' is clear from the 'restore:' tag. > When restoring a container with `pct restore`, the `--password` and > `--ssh-public-keys` options are silently ignored. Previously, the API > endpoint only invoked setup hooks during initial container creation or > cloning, skipping them entirely for restores. > > Introduce a new `post_restore_hook` in the LXC setup plugin > architecture. This hook applies the provided credentials if they are > defined. > > Add `check_systemd_nesting` to the `post_restore_hook`. Why is this added? A rational here would be helpful. If the reason is just symmetry with `post_create_hook`, we might need to be careful here, as this could introduce new unwanted failure conditions. I have not checked in detail, but some of the code can die. > > Move `template_fixup`from the API endpoint function to the Nit: Missing space (`template_fixup`from) > `post_restore_hook`, matching the `post_create_hook` logic. > > Signed-off-by: Elias Huhsovitz > --- > > v1: https://lore.proxmox.com/all/20260716153959.183045-1-e.huhsovitz@proxmox.com/ > > Changes made according to the feedback (big thanks): > https://lore.proxmox.com/all/95a38704-543e-4820-b36c-696cf192a684@proxmox.com/ > > changes v1->v2: > * move logic into new function `post_restore_hook` > * do not call `post_create_hook` unconditionally > * conditionally call functions to: > - set password > - set ssh keys > * call `check_systemd_nesting()` for pct restore > > src/PVE/API2/LXC.pm | 2 +- > src/PVE/LXC/Setup.pm | 9 +++++++++ > src/PVE/LXC/Setup/Base.pm | 9 +++++++++ > src/PVE/LXC/Setup/Plugin.pm | 5 +++++ > src/PVE/LXC/Setup/Unmanaged.pm | 4 ++++ > 5 files changed, 28 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm > index 22320ba..ad3b635 100644 > --- a/src/PVE/API2/LXC.pm > +++ b/src/PVE/API2/LXC.pm > @@ -590,7 +590,7 @@ __PACKAGE__->register_method({ > ); > PVE::LXC::create_ifaces_ipams_ips($conf, $vmid) if $unique; > my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); > - $lxc_setup->template_fixup($conf); > + $lxc_setup->post_restore_hook($password, $ssh_keys); > } else { > my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); # detect OS > PVE::LXC::Config->write_config($vmid, $conf); # safe config (after OS detection) > diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm > index d936af2..58cadba 100644 > --- a/src/PVE/LXC/Setup.pm > +++ b/src/PVE/LXC/Setup.pm > @@ -329,6 +329,15 @@ sub post_create_hook { > $self->check_systemd_nesting(); > } > > +sub post_restore_hook { > + my ($self, $root_password, $ssh_keys) = @_; > + > + $self->protected_call(sub { > + $self->{plugin}->post_restore_hook($self->{conf}, $root_password, $ssh_keys); > + }); > + $self->check_systemd_nesting(); > +} > + > sub unified_cgroupv2_support { > my ($self) = @_; > > diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm > index 567f9d6..f0e1f01 100644 > --- a/src/PVE/LXC/Setup/Base.pm > +++ b/src/PVE/LXC/Setup/Base.pm > @@ -735,6 +735,15 @@ sub post_create_hook { > # fixme: what else ? > } > > +sub post_restore_hook { > + my ($self, $conf, $root_password, $ssh_keys) = @_; > + > + $self->template_fixup($conf); > + > + $self->set_user_password($conf, 'root', $root_password) if defined($root_password); > + $self->set_user_authorized_ssh_keys($conf, 'root', $ssh_keys) if defined($ssh_keys); The `post_create_hook` uses `if $ssh_keys`, so I think this should also be used here instead of `if defined($ssh_keys)`? > +} > + > # File access wrappers for container setup code. > # NOTE: those are not direct part of the Plugin API (yet), avoid using them outside the child plugins > # For user-namespace support these might need to take uid and gid maps into account. > diff --git a/src/PVE/LXC/Setup/Plugin.pm b/src/PVE/LXC/Setup/Plugin.pm > index 95a633f..6ba656b 100644 > --- a/src/PVE/LXC/Setup/Plugin.pm > +++ b/src/PVE/LXC/Setup/Plugin.pm > @@ -99,4 +99,9 @@ sub post_create_hook { > croak "implement me in sub-class"; > } > > +sub post_restore_hook { > + my ($self, $conf, $root_password, $ssh_keys) = @_; > + croak "implement me in sub-class"; > +} > + > 1; > diff --git a/src/PVE/LXC/Setup/Unmanaged.pm b/src/PVE/LXC/Setup/Unmanaged.pm > index b51be55..0b440cf 100644 > --- a/src/PVE/LXC/Setup/Unmanaged.pm > +++ b/src/PVE/LXC/Setup/Unmanaged.pm > @@ -84,4 +84,8 @@ sub post_create_hook { > my ($self, $conf, $root_password, $ssh_keys) = @_; > } > > +sub post_restore_hook { > + my ($self, $conf, $root_password, $ssh_keys) = @_; > +} > + > 1;