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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 058036951C for ; Fri, 12 Feb 2021 13:23:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E853125205 for ; Fri, 12 Feb 2021 13:23:27 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 25E35250CB for ; Fri, 12 Feb 2021 13:23:27 +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 DB2B146244 for ; Fri, 12 Feb 2021 13:23:26 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 12 Feb 2021 13:23:20 +0100 Message-Id: <20210212122323.15461-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [common.pm] Subject: [pve-devel] [PATCH guest-common 1/4] vzdump: loosen mailto pattern to allow whitespaces 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: Fri, 12 Feb 2021 12:23:58 -0000 to make it more compatible to what we had previously. In pve-manger, split_list() is called on the parameter, so any whitespaces and even stand-alone ',' and ';' are taken care of, leaving only the real addresses. This also fixes creating a backup job with empty mailto in the UI. For example, > vzdump 153 --mailto " ,,,developer@proxmox.com; admin@proxmox.com ; " was valid and worked in PVE 6.2. Signed-off-by: Fabian Ebner --- PVE/VZDump/Common.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/VZDump/Common.pm b/PVE/VZDump/Common.pm index af141de..fb11b3d 100644 --- a/PVE/VZDump/Common.pm +++ b/PVE/VZDump/Common.pm @@ -72,7 +72,7 @@ sub parse_dow { }; my $mailto_pattern = '[a-zA-Z0-9+._@][-a-zA-Z0-9+._@]*'; -my $mailto_list_pattern = "($mailto_pattern)([;,]$mailto_pattern)*"; +my $mailto_list_pattern = qr/([;,]?(?:$mailto_pattern|\s*))*/; my $confdesc = { vmid => { -- 2.20.1