From 17b5185b77cadd58c0c60c48aa78db43c3bf2e7f Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Mon, 15 Feb 2021 13:24:59 +0100 Subject: [PATCH] vzdump: mailto: use email-or-username-list format because it is a more complete pattern. Also, 'mailto' was a '-list' format in PVE 6.2 and earlier, so this also fixes whitespace-related backwards compatibility. In particular, this fixes creating a backup job in the GUI without setting an address, which passes along ''. For example, > vzdump 153 --mailto " ,,,admin@proxmox.com;;; developer@proxmox.com , ; " was valid and worked in PVE 6.2. Signed-off-by: Fabian Ebner --- PVE/VZDump/Common.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PVE/VZDump/Common.pm b/PVE/VZDump/Common.pm index 5d93b51..86cb7bd 100644 --- a/PVE/VZDump/Common.pm +++ b/PVE/VZDump/Common.pm @@ -71,9 +71,6 @@ sub parse_dow { return $res; }; -my $mailto_pattern = '[a-zA-Z0-9+._@][-a-zA-Z0-9+._@]*'; -my $mailto_list_pattern = "($mailto_pattern)([;,]$mailto_pattern)*"; - my $confdesc = { vmid => { type => 'string', format => 'pve-vmid-list', @@ -146,8 +143,7 @@ my $confdesc = { }, mailto => { type => 'string', - pattern => $mailto_list_pattern, - format_description => 'email-or-username-list', + format => 'email-or-username-list', description => "Comma-separated list of email addresses or users that should" . " receive email notifications.", optional => 1,