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 25574AE6B for ; Thu, 28 Apr 2022 10:08:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C0B82E57D for ; Thu, 28 Apr 2022 10:07:46 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 25D462E560 for ; Thu, 28 Apr 2022 10:07:45 +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 D8A3342F3C for ; Thu, 28 Apr 2022 10:07:44 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 28 Apr 2022 10:07:39 +0200 Message-Id: <20220428080741.55308-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.080 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [vzdump.pm] Subject: [pve-devel] [PATCH manager 1/1] vzdump: check that notes-template is a single line 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, 28 Apr 2022 08:08:16 -0000 While vzdump itself wouldn't mind about unescaped newlines, the parameter isn't supposed to contain any, and when used as part of the job config, it has to be a single line too, so make it consistent. Signed-off-by: Fabian Ebner --- These are follow-ups for the "add protected and notes-template parameters for vzdump" series. PVE/VZDump.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index fcbd87d5..80cbddb5 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -1326,6 +1326,9 @@ sub verify_vzdump_parameters { $parse_prune_backups_maxfiles->($param, 'CLI parameters'); + raise_param_exc({'notes-template' => "contains a line feed"}) + if $param->{'notes-template'} && $param->{'notes-template'} =~ m/\n/; + $param->{all} = 1 if (defined($param->{exclude}) && !$param->{pool}); return if !$check_missing; -- 2.30.2