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 08EC6A8F9 for ; Wed, 27 Apr 2022 17:41:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F282328D49 for ; Wed, 27 Apr 2022 17:41:21 +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 F0C0628D26 for ; Wed, 27 Apr 2022 17:41:19 +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 CA9CA42E8B for ; Wed, 27 Apr 2022 17:41:19 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 27 Apr 2022 17:41:16 +0200 Message-Id: <20220427154116.115071-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220427154116.115071-1-f.ebner@proxmox.com> References: <20220427154116.115071-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 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 Subject: [pve-devel] [PATCH v4 manager 7/7] vzdump: generate notes: die upon unexpected escape character or variable 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: Wed, 27 Apr 2022 15:41:22 -0000 Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 5f78746d..fcbd87d5 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -80,16 +80,20 @@ my $generate_notes = sub { vmid => $task->{vmid}, }; - my $unescape = { - '\\\\' => '\\', # replace \\ by \ - '\n' => "\n", # turn literal \n into real newline + my $unescape = sub { + my ($char) = @_; + return '\\' if $char eq '\\'; + return "\n" if $char eq 'n'; + die "unexpected escape character '$char'\n"; }; - $notes_template =~ s/(\Q\\\E|\Q\n\E)/$unescape->{$1}/g; + $notes_template =~ s/\\(.)/$unescape->($1)/eg; my $vars = join('|', keys $info->%*); $notes_template =~ s/\{\{($vars)\}\}/\Q$info->{$1}\E/g; + die "unexpected variable name '$1'" if $notes_template =~ m/\{\{([^\s]+)\}\}/; + return $notes_template; }; @@ -1042,9 +1046,13 @@ sub exec_backup_task { if ($opts->{'notes-template'} && $opts->{'notes-template'} ne '') { debugmsg('info', "adding notes to backup", $logfd); - my $notes = $generate_notes->($opts->{'notes-template'}, $task); - eval { PVE::Storage::update_volume_attribute($cfg, $volid, 'notes', $notes) }; - debugmsg('warn', "unable to add notes - $@", $logfd) if $@; + my $notes = eval { $generate_notes->($opts->{'notes-template'}, $task); }; + if (my $err = $@) { + debugmsg('warn', "unable to add notes - $err", $logfd); + } else { + eval { PVE::Storage::update_volume_attribute($cfg, $volid, 'notes', $notes) }; + debugmsg('warn', "unable to add notes - $@", $logfd) if $@; + } } if ($opts->{protected}) { -- 2.30.2