From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C9ABEC0806 for ; Thu, 11 Jan 2024 11:52:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A3348F949 for ; Thu, 11 Jan 2024 11:51:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 11 Jan 2024 11:51:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E919C490A4 for ; Thu, 11 Jan 2024 11:51:43 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 11 Jan 2024 11:51:18 +0100 Message-Id: <20240111105123.370028-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240111105123.370028-1-f.gruenbichler@proxmox.com> References: <20240111105123.370028-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH cluster 4/4] pvecm: stop merging SSH known hosts by default 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: , X-List-Received-Date: Thu, 11 Jan 2024 10:52:14 -0000 and allow explicitly unmerging to remove the symlink altogether. Signed-off-by: Fabian Grünbichler --- src/PVE/CLI/pvecm.pm | 10 ++++++++-- src/PVE/Cluster/Setup.pm | 9 ++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/PVE/CLI/pvecm.pm b/src/PVE/CLI/pvecm.pm index 0005e4b..0e8ca8f 100755 --- a/src/PVE/CLI/pvecm.pm +++ b/src/PVE/CLI/pvecm.pm @@ -567,12 +567,18 @@ __PACKAGE__->register_method ({ type => 'boolean', optional => 1, }, + 'unmerge-known-hosts' => { + description => "Unmerge legacy SSH known hosts.", + type => 'boolean', + optional => 1, + default => 0, + }, }, }, returns => { type => 'null' }, code => sub { my ($param) = @_; - my ($force_new_cert, $silent) = $param->@{qw(force silent)}; + my ($force_new_cert, $silent, $unmerge) = $param->@{qw(force silent unmerge-known-hosts)}; # pveproxy's ExecStartPre calls this, and as we do IO (on /etc/pve) that can hang # (uninterruptible D state) we could fail the whole service, rendering the API guaranteed @@ -585,7 +591,7 @@ __PACKAGE__->register_method ({ usleep(100 * 1000); } - PVE::Cluster::Setup::updatecerts_and_ssh($force_new_cert, $silent); + PVE::Cluster::Setup::updatecerts_and_ssh($force_new_cert, $silent, $unmerge); PVE::Cluster::prepare_observed_file_basedirs(); }); if ($got_timeout) { diff --git a/src/PVE/Cluster/Setup.pm b/src/PVE/Cluster/Setup.pm index 4b6f013..42dff85 100644 --- a/src/PVE/Cluster/Setup.pm +++ b/src/PVE/Cluster/Setup.pm @@ -816,7 +816,7 @@ sub generate_local_files { } sub updatecerts_and_ssh { - my ($force_new_cert, $silent) = @_; + my ($force_new_cert, $silent, $unmerge_ssh) = @_; my $p = sub { print "$_[0]\n" if !$silent }; @@ -834,9 +834,12 @@ sub updatecerts_and_ssh { $p->("generate new node certificate") if $force_new_cert; gen_pve_node_files($nodename, $local_ip_address, $force_new_cert); - $p->("merge authorized SSH keys and known hosts"); + $p->("merge authorized SSH keys"); ssh_merge_keys(); - ssh_merge_known_hosts($nodename, $local_ip_address, 1); + if ($unmerge_ssh) { + $p->("unmerge SSH known hosts"); + ssh_unmerge_known_hosts(); + } ssh_create_node_known_hosts($nodename); gen_pve_vzdump_files(); } -- 2.39.2