proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-07 16:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sendmail: use more complete email regex and shellquote

Browse Source 
Shellquote is needed for '~', and while it doesn't help with '-',
there should be no problem, because options are separated from mailto
since commit 216a3f4f13.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Reviewed-By: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-02-15 13:24:55 +01:00 committed by Thomas Lamprecht
parent af640684dc
commit 4c4bd1047c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PVE/JSONSchema.pm
View File

@ -471,7 +471,7 @@ register_format('email', \&pve_verify_email);
sub pve_verify_email { sub pve_verify_email {
my ($email, $noerr) = @_; 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; return undef if $noerr;
die "value does not look like a valid email address\n"; die "value does not look like a valid email address\n";
} }

17
src/PVE/Tools.pm
View File

@ -87,6 +87,9 @@ our $IPV6RE = "(?:" .
our $IPRE = "(?:$IPV4RE|$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, use constant {CLONE_NEWNS => 0x00020000,
CLONE_NEWUTS => 0x04000000, CLONE_NEWUTS => 0x04000000,
CLONE_NEWIPC => 0x08000000, CLONE_NEWIPC => 0x08000000,
@ -1469,23 +1472,27 @@ sub sync_mountpoint {
# mailto may be a single email string or an array of receivers # mailto may be a single email string or an array of receivers
sub sendmail { sub sendmail {
my ($mailto, $subject, $text, $html, $mailfrom, $author) = @_; my ($mailto, $subject, $text, $html, $mailfrom, $author) = @_;
my $mail_re = qr/[^-a-zA-Z0-9+._@]/;
$mailto = [ $mailto ] if !ref($mailto); $mailto = [ $mailto ] if !ref($mailto);
my $mailto_quoted = [];
for my $to (@$mailto) { 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); my $rcvrtxt = join (', ', @$mailto);
$mailfrom = $mailfrom || "root"; $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'; $author = $author // 'Proxmox VE';
open (MAIL, "|-", "sendmail", "-B", "8BITMIME", "-f", $mailfrom, "--", @$mailto) || open (MAIL, "|-", "sendmail", "-B", "8BITMIME", "-f", $mailfrom_quoted,
die "unable to open 'sendmail' - $!"; "--", @$mailto_quoted) || die "unable to open 'sendmail' - $!";
my $date = time2str('%a, %d %b %Y %H:%M:%S %z', time()); my $date = time2str('%a, %d %b %Y %H:%M:%S %z', time());