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 EA9B369F65 for ; Mon, 15 Feb 2021 13:25:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C07C0A877 for ; Mon, 15 Feb 2021 13:25:16 +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 6F9C2A832 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 3EAF14625C 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:55 +0100 Message-Id: <20210215122502.23854-2-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 common 1/8] sendmail: use more complete email regex and shellquote 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 Shellquote is needed for '~', and while it doesn't help with '-', there should be no problem, because options are separated from mailto since commit 216a3f4f131693dc4bbad5e06e96a61baef5f5e9. Signed-off-by: Fabian Ebner --- New in v2. Since JSONSchema already uses Tools, the pattern has to live in Tools. src/PVE/JSONSchema.pm | 2 +- src/PVE/Tools.pm | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 29ada5b..5870b69 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -471,7 +471,7 @@ register_format('email', \&pve_verify_email); sub pve_verify_email { my ($email, $noerr) = @_; - if ($email !~ /^[\w\+\-\~]+(\.[\w\+\-\~]+)*@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*$/) { + if ($email !~ /^$PVE::Tools::EMAIL_RE$/) { return undef if $noerr; die "value does not look like a valid email address\n"; } diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index 7fefa52..fc4a367 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -87,6 +87,9 @@ our $IPV6RE = "(?:" . our $IPRE = "(?:$IPV4RE|$IPV6RE)"; +our $EMAIL_USER_RE = qr/[\w\+\-\~]+(\.[\w\+\-\~]+)*/; +our $EMAIL_RE = qr/$EMAIL_USER_RE@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*/; + use constant {CLONE_NEWNS => 0x00020000, CLONE_NEWUTS => 0x04000000, CLONE_NEWIPC => 0x08000000, @@ -1469,23 +1472,27 @@ sub sync_mountpoint { # mailto may be a single email string or an array of receivers sub sendmail { my ($mailto, $subject, $text, $html, $mailfrom, $author) = @_; - my $mail_re = qr/[^-a-zA-Z0-9+._@]/; $mailto = [ $mailto ] if !ref($mailto); + my $mailto_quoted = []; for my $to (@$mailto) { - die "illegal character in mailto address\n" if $to =~ $mail_re; + die "mailto does not look like a valid email address or username\n" + if $to !~ /^$EMAIL_RE$/ && $to !~ /^$EMAIL_USER_RE$/; + push @$mailto_quoted, shellquote($to); } my $rcvrtxt = join (', ', @$mailto); $mailfrom = $mailfrom || "root"; - die "illegal character in mailfrom address\n" if $mailfrom =~ $mail_re; + die "mailfrom does not look like a valid email address or username\n" + if $mailfrom !~ /^$EMAIL_RE$/ && $mailfrom !~ /^$EMAIL_USER_RE$/; + my $mailfrom_quoted = shellquote($mailfrom); $author = $author // 'Proxmox VE'; - open (MAIL, "|-", "sendmail", "-B", "8BITMIME", "-f", $mailfrom, "--", @$mailto) || - die "unable to open 'sendmail' - $!"; + open (MAIL, "|-", "sendmail", "-B", "8BITMIME", "-f", $mailfrom_quoted, + "--", @$mailto_quoted) || die "unable to open 'sendmail' - $!"; my $date = time2str('%a, %d %b %Y %H:%M:%S %z', time()); -- 2.20.1