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 8937AC06EB for ; Thu, 11 Jan 2024 11:52:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 62B72F9A4 for ; Thu, 11 Jan 2024 11:51:37 +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:36 +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 A7DBA490A4 for ; Thu, 11 Jan 2024 11:51:36 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 11 Jan 2024 11:51:16 +0100 Message-Id: <20240111105123.370028-3-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 2/4] fix #4886: SSH: pin node's host key if available 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:07 -0000 if the target node has already stored their SSH host key on pmxcfs, pin it and ignore the global known hosts information. Signed-off-by: Fabian Grünbichler --- src/PVE/SSHInfo.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/PVE/SSHInfo.pm b/src/PVE/SSHInfo.pm index c351148..fad23bf 100644 --- a/src/PVE/SSHInfo.pm +++ b/src/PVE/SSHInfo.pm @@ -49,11 +49,24 @@ sub get_ssh_info { sub ssh_info_to_command_base { my ($info, @extra_options) = @_; + + my $nodename = $info->{name}; + + my $known_hosts_file = "/etc/pve/nodes/$nodename/ssh_known_hosts"; + my $known_hosts_options = undef; + if (-f $known_hosts_file) { + $known_hosts_options = [ + '-o', "UserKnownHostsFile=$known_hosts_file", + '-o', 'GlobalKnownHostsFile=none', + ]; + } + return [ '/usr/bin/ssh', '-e', 'none', '-o', 'BatchMode=yes', - '-o', 'HostKeyAlias='.$info->{name}, + '-o', 'HostKeyAlias='.$nodename, + defined($known_hosts_options) ? @$known_hosts_options : (), @extra_options ]; } -- 2.39.2