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 2B7D469521 for ; Fri, 12 Feb 2021 13:23:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2241425207 for ; Fri, 12 Feb 2021 13:23:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 25BB1250CA for ; Fri, 12 Feb 2021 13:23:27 +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 D857746241 for ; Fri, 12 Feb 2021 13:23:26 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 12 Feb 2021 13:23:21 +0100 Message-Id: <20210212122323.15461-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210212122323.15461-1-f.ebner@proxmox.com> References: <20210212122323.15461-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.001 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [vzdump.pm, common.pm] Subject: [pve-devel] [PATCH manager 2/4] vzdump: refactor parsing mailto and exclude-path 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, 12 Feb 2021 12:23:58 -0000 so it can be mocked. Signed-off-by: Fabian Ebner --- PVE/API2/VZDump.pm | 11 +---------- PVE/VZDump.pm | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm index 806ac7fd..44376106 100644 --- a/PVE/API2/VZDump.pm +++ b/PVE/API2/VZDump.pm @@ -88,16 +88,7 @@ __PACKAGE__->register_method ({ # silent exit if specified VMs run on other nodes return "OK" if !scalar(@{$local_vmids}) && !$param->{all}; - # exclude-path list need to be 0 separated - if (defined($param->{'exclude-path'})) { - my @expaths = split(/\0/, $param->{'exclude-path'} || ''); - $param->{'exclude-path'} = [ @expaths ]; - } - - if (defined($param->{mailto})) { - my @mailto = PVE::Tools::split_list(extract_param($param, 'mailto')); - $param->{mailto} = [ @mailto ]; - } + PVE::VZDump::parse_mailto_exclude_path($param); die "you can only backup a single VM with option --stdout\n" if $param->{stdout} && scalar(@{$local_vmids}) != 1; diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index a99d0565..2ddfa851 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -1177,6 +1177,27 @@ sub option_exists { return defined($confdesc->{$key}); } +# NOTE it might make sense to merge this and verify_vzdump_parameters(), but one +# needs to adapt command_line() in guest-common's PVE/VZDump/Common.pm and detect +# a second parsing attempt, because verify_vzdump_parameters() is called twice +# during the update_job API call. +sub parse_mailto_exclude_path { + my ($param) = @_; + + # exclude-path list need to be 0 separated + if (defined($param->{'exclude-path'})) { + my @expaths = split(/\0/, $param->{'exclude-path'} || ''); + $param->{'exclude-path'} = [ @expaths ]; + } + + if (defined($param->{mailto})) { + my @mailto = PVE::Tools::split_list(extract_param($param, 'mailto')); + $param->{mailto} = [ @mailto ]; + } + + return; +} + sub verify_vzdump_parameters { my ($param, $check_missing) = @_; -- 2.20.1