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 937AC70B02 for ; Mon, 9 May 2022 12:35:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C5DC2B6B9 for ; Mon, 9 May 2022 12:34:19 +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 24F8C2B67A for ; Mon, 9 May 2022 12:34:17 +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 F00C24323F for ; Mon, 9 May 2022 12:34:16 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 9 May 2022 12:34:08 +0200 Message-Id: <20220509103413.68248-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220509103413.68248-1-f.ebner@proxmox.com> References: <20220509103413.68248-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.077 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 manager 1/6] vzdump: verify parameters: properly verify notes-template 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: Mon, 09 May 2022 10:35:18 -0000 instead of just checking for a newline, do a full check already. Also do the check at the beginning of generate_notes() for consistency and remove the check after expansion to avoid failing late for things like '{{cl{{node}}er}}' (which can even expand to a valid variable making the error even more confusing). Co-developed-by: Thomas Lamprecht Signed-off-by: Fabian Ebner --- Re-sent v3. Changes from v2: * Check early rather than injecting error into notes. PVE/VZDump.pm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index edcab696..0dbf8928 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -70,9 +70,32 @@ sub run_command { PVE::Tools::run_command($cmdstr, %param, logfunc => $logfunc); } +my $verify_notes_template = sub { + my ($template) = @_; + + die "contains a line feed\n" if $template =~ /\n/; + + my @problematic = (); + while ($template =~ /\\(.)/g) { + my $char = $1; + push @problematic, "escape sequence '\\$char' at char " . (pos($template) - 2) + if $char !~ /^[n\\]$/; + } + + while ($template =~ /\{\{([^\s{}]+)\}\}/g) { + my $var = $1; + push @problematic, "variable '$var' at char " . (pos($template) - length($var)) + if $var !~ /^(cluster|guestname|node|vmid)$/; + } + + die "found unknown: " . join(', ', @problematic) . "\n" if scalar(@problematic); +}; + my $generate_notes = sub { my ($notes_template, $task) = @_; + $verify_notes_template->($notes_template); + my $info = { cluster => PVE::Cluster::get_clinfo()->{cluster}->{name}, guestname => $task->{hostname}, @@ -92,8 +115,6 @@ my $generate_notes = sub { my $vars = join('|', keys $info->%*); $notes_template =~ s/\{\{($vars)\}\}/$info->{$1}/g; - die "unexpected variable name '$1'\n" if $notes_template =~ m/\{\{([^\s}]+)\}\}/; - return $notes_template; }; @@ -1325,8 +1346,10 @@ 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/; + if (my $template = $param->{'notes-template'}) { + eval { $verify_notes_template->($template); }; + raise_param_exc({'notes-template' => $@}) if $@; + } $param->{all} = 1 if (defined($param->{exclude}) && !$param->{pool}); -- 2.30.2