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 A77DD69F74 for ; Mon, 15 Feb 2021 13:25:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 94353A87E for ; Mon, 15 Feb 2021 13:25:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 EBD1EA858 for ; Mon, 15 Feb 2021 13:25:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B828C45F48 for ; Mon, 15 Feb 2021 13:25:15 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 15 Feb 2021 13:24:59 +0100 Message-Id: <20210215122502.23854-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210215122502.23854-1-f.ebner@proxmox.com> References: <20210215122502.23854-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.001 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 v2 guest-common 5/8] vzdump: mailto: use email-or-username-list format 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, 15 Feb 2021 12:25:47 -0000 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 --- Changes from v1: * re-use the more complete pattern from pve-common Dependency bump for pve-common is needed. 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, -- 2.20.1