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 81792735CD for ; Fri, 28 May 2021 14:10:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6D493942A for ; Fri, 28 May 2021 14:10:04 +0200 (CEST) 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 id 6788D941B for ; Fri, 28 May 2021 14:10:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2DF1A466B1 for ; Fri, 28 May 2021 14:10:03 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 28 May 2021 14:09:53 +0200 Message-Id: <20210528120953.525423-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH REBASE qemu-server] vzdump: add master key support 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: Fri, 28 May 2021 12:10:34 -0000 running outdated VMs without master key support will generate a warning but proceed with a backup without encrypted key upload. Signed-off-by: Fabian Grünbichler --- context in second hunk changed.. PVE/VZDump/QemuServer.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 42a60fc..34ca624 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -447,6 +447,7 @@ sub archive_pbs { my $repo = PVE::PBSClient::get_repository($scfg); my $password = PVE::Storage::PBSPlugin::pbs_get_password($scfg, $opts->{storage}); my $keyfile = PVE::Storage::PBSPlugin::pbs_encryption_key_file_name($scfg, $opts->{storage}); + my $master_keyfile = PVE::Storage::PBSPlugin::pbs_master_pubkey_file_name($scfg, $opts->{storage}); my $diskcount = scalar(@{$task->{disks}}); # proxmox-backup-client can only handle raw files and block devs @@ -501,6 +502,12 @@ sub archive_pbs { } } + if (!defined($qemu_support->{"pbs-masterkey"}) && -e $master_keyfile) { + $self->loginfo("WARNING: backup target is configured with master key, but running QEMU version does not support master keys."); + $self->loginfo("Please make sure you've installed the latest version and the VM has been restarted to use master key feature."); + $master_keyfile = undef; # skip rest of master key handling below + } + my $fs_frozen = $self->qga_fs_freeze($task, $vmid); my $params = { @@ -519,7 +526,13 @@ sub archive_pbs { $self->loginfo("enabling encryption"); $params->{keyfile} = $keyfile; $params->{encrypt} = JSON::true; + if (defined($master_keyfile) && -e $master_keyfile) { + $self->loginfo("enabling master key feature"); + $params->{"master-keyfile"} = $master_keyfile; + } } else { + $self->loginfo("WARNING: backup target is configured with master key, but this backup is not encrypted - master key settings will be ignored!") + if defined($master_keyfile) && -e $master_keyfile; $params->{encrypt} = JSON::false; } -- 2.20.1