From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A7A1B1FF17A for ; Fri, 4 Jul 2025 20:23:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 521BF3E136; Fri, 4 Jul 2025 20:23:47 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Fri, 4 Jul 2025 20:23:35 +0200 Message-Id: <20250704182336.469274-2-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250704182336.469274-1-d.kral@proxmox.com> References: <20250704182336.469274-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.218 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC container v2 2/3] setup: base: remove existing ssh host keys X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Remove existing SSH host keys after container creation to prevent multiple containers sharing the same SSH host keys, especially those which are not overwritten/generated by rewrite_ssh_host_keys() later. This is called in the Base's post_create_hook(...) to prevent unwanted removal for certain types of containers, e.g., unmanaged containers. Signed-off-by: Daniel Kral --- Because of the HA Rules stuff, I unfortunately didn't get the time to properly test these with any container images, but wanted to send them anyway. src/PVE/LXC/Setup/Base.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm index dbfc775..ea6f598 100644 --- a/src/PVE/LXC/Setup/Base.pm +++ b/src/PVE/LXC/Setup/Base.pm @@ -466,6 +466,30 @@ sub set_user_password { } } +sub remove_existing_ssh_host_keys { + my ($self) = @_; + + my $ssh_rootdir = "$self->{rootdir}/etc/ssh"; + + return if !-d $ssh_rootdir; + + PVE::Tools::dir_glob_foreach( + $ssh_rootdir, + qr/ssh_host_.*/, + sub { + my ($key_filename) = @_; + + next if $self->ct_is_file_ignored($key_filename); + + print "Remove existing ssh host key '$key_filename' ...\n"; + + $self->protected_call(sub { + $self->ct_unlink($key_filename); + }); + }, + ); +} + my $parse_home_dir = sub { my ($self, $passwdfile, $user) = @_; @@ -687,6 +711,7 @@ sub post_create_hook { &$randomize_crontab($self, $conf); $self->set_user_password($conf, 'root', $root_password); + $self->remove_existing_ssh_host_keys(); $self->set_user_authorized_ssh_keys($conf, 'root', $ssh_keys) if $ssh_keys; $self->setup_init($conf); $self->setup_network($conf); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel