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 F0735628ED for ; Sun, 7 Feb 2021 15:18:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E4B1219C4F for ; Sun, 7 Feb 2021 15:18:34 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id D795119C47 for ; Sun, 7 Feb 2021 15:18:33 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id B88F0F9DFC; Sun, 7 Feb 2021 15:18:33 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Sun, 7 Feb 2021 15:18:32 +0100 Message-Id: <20210207141832.3283706-1-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.190 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH V2 qemu-server] fix #1739: cloudinit: add cisshdeletehostkeys option 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: Sun, 07 Feb 2021 14:18:35 -0000 This define behaviour of ssh server keys generation on cloudinit config change. different value: - once : only once at vmstart (default value) - no|off|false : never generate ssh key - yes|on|true: always generate ssh key When value is defined to 'once', the value is rewriten to 'no' in vmconfig after vm start We need to change instance-id at each config change because network configuration is only done once in pre-init local service, and a lock is done on instance-id, and they are no way to change that in cloudinit vm config. The ssh host keys are regenerated by ssh module, once by instance. user could change that,and do only once, but in this same ssh module, the user public keys are also deployed. Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 9 ++++++++- PVE/QemuServer/Cloudinit.pm | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index f401baf..c899b35 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -760,6 +760,13 @@ my $confdesc_cloudinit = { format => 'urlencoded', description => "cloud-init: Setup public SSH keys (one key per line, OpenSSH format).", }, + cisshdeletehostkeys => { + optional => 1, + type => 'string', + enum => [qw(once yes no on off true false)], + default_key => 1, + description => "cloud-init: Regenerate host SSH keys on config change.", + }, }; # what about other qemu settings ? @@ -4951,7 +4958,7 @@ sub vm_start_nolock { $conf = PVE::QemuConfig->load_config($vmid); # update/reload } - PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid); + PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid, 1); my $defaults = load_defaults(); diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm index c464bf3..7b24f93 100644 --- a/PVE/QemuServer/Cloudinit.pm +++ b/PVE/QemuServer/Cloudinit.pm @@ -135,6 +135,7 @@ sub cloudinit_userdata { foreach my $k (@$keys) { $content .= " - $k\n"; } + $content .= "ssh_deletekeys: false\n" if defined($conf->{cisshdeletehostkeys}) && $conf->{cisshdeletehostkeys} =~ m/^(off|no|false)/; } $content .= "chpasswd:\n"; $content .= " expire: False\n"; @@ -554,9 +555,10 @@ my $cloudinit_methods = { }; sub generate_cloudinitconfig { - my ($conf, $vmid) = @_; + my ($conf, $vmid, $vmstart) = @_; my $format = get_cloudinit_format($conf); + my $generated = undef; PVE::QemuConfig->foreach_volume($conf, sub { my ($ds, $drive) = @_; @@ -569,7 +571,13 @@ sub generate_cloudinitconfig { or die "missing cloudinit methods for format '$format'\n"; $generator->($conf, $vmid, $drive, $volname, $storeid); + $generated = 1; }); + + if ($vmstart && $generated && (!defined($conf->{cisshdeletehostkeys}) || $conf->{cisshdeletehostkeys} eq 'once')) { + $conf->{cisshdeletehostkeys} = 'no'; + PVE::QemuConfig->write_config($vmid, $conf); + } } sub dump_cloudinit_config { -- 2.20.1