From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 90CA1C3DF
for <pve-devel@lists.proxmox.com>; Tue, 3 May 2022 13:18:05 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 87E04413
for <pve-devel@lists.proxmox.com>; Tue, 3 May 2022 13:18:05 +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 C4888407
for <pve-devel@lists.proxmox.com>; Tue, 3 May 2022 13:18:04 +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 99EE0430FF
for <pve-devel@lists.proxmox.com>; Tue, 3 May 2022 13:18:04 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 3 May 2022 13:18:00 +0200
Message-Id: <20220503111800.64511-3-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220503111800.64511-1-f.ebner@proxmox.com>
References: <20220503111800.64511-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.083 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 -
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/RFC v2 manager 3/3] vzdump: notes-template:
replace unknown variable with error string
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 03 May 2022 11:18:05 -0000
rather than not setting the notes at all. They still can contain
useful information, and it likely is surprising to users to lose all
of the note when an unkown variable (or simply mistyped) is provided.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/VZDump.pm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 05cc1bec..79dcd62b 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -71,7 +71,7 @@ sub run_command {
}
my $generate_notes = sub {
- my ($notes_template, $task) = @_;
+ my ($notes_template, $task, $logfd) = @_;
my $info = {
cluster => PVE::Cluster::get_clinfo()->{cluster}->{name},
@@ -89,10 +89,14 @@ my $generate_notes = sub {
$notes_template =~ s/\\(.)/$unescape->($1)/eg;
- my $vars = join('|', keys $info->%*);
- $notes_template =~ s/\{\{($vars)\}\}/$info->{$1}/g;
+ my $replace_var = sub {
+ my ($var) = @_;
+ return $info->{$var} if exists($info->{$var});
+ debugmsg('warn', "notes-template: unknown variable '$var'", $logfd);
+ return "<unknown variable '$var'>";
+ };
- die "unexpected variable name '$1'" if $notes_template =~ m/\{\{([^\s}]+)\}\}/;
+ $notes_template =~ s/\{\{([^\s}]+)\}\}/$replace_var->($1)/eg;
return $notes_template;
};
@@ -1045,7 +1049,7 @@ sub exec_backup_task {
if ($opts->{'notes-template'} && $opts->{'notes-template'} ne '') {
debugmsg('info', "adding notes to backup", $logfd);
- my $notes = eval { $generate_notes->($opts->{'notes-template'}, $task); };
+ my $notes = eval { $generate_notes->($opts->{'notes-template'}, $task, $logfd); };
if (my $err = $@) {
debugmsg('warn', "unable to add notes - $err", $logfd);
} else {
--
2.30.2