diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-06-26 22:49:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 22:49:07 +0200 |
commit | 9e7f6444384c0990b89dda0ead7926b6307b960a (patch) | |
tree | 7ca1e028d176570a074912839263afaf1007b555 /Bugzilla/Mailer.pm | |
parent | 5a8de6e08bf6f2c8dbc0f17662281314ae2cfc9b (diff) | |
download | bugzilla-9e7f6444384c0990b89dda0ead7926b6307b960a.tar.gz bugzilla-9e7f6444384c0990b89dda0ead7926b6307b960a.tar.xz |
Bug 1471304 - Block sending mail to hosts that end with .tld or .bugs
Diffstat (limited to 'Bugzilla/Mailer.pm')
-rw-r--r-- | Bugzilla/Mailer.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm index 1b77e5063..c9a458b47 100644 --- a/Bugzilla/Mailer.pm +++ b/Bugzilla/Mailer.pm @@ -190,11 +190,16 @@ sub MessageToMTA { my @recipients = Email::Address->parse($to); die qq{Unable to parse "To:" address - $to\n} unless @recipients; die qq{Did not expect more than one "To:" address in $to\n} if @recipients > 1; - my $badhosts = Bugzilla::Bloomfilter->lookup("badhosts") or die "No badhosts bloomfilter\n"; - if ($badhosts->test($recipients[0]->host)) { + my $recipient = $recipients[0]; + my $badhosts = Bugzilla::Bloomfilter->lookup("badhosts"); + if ($badhosts && $badhosts->test($recipient->host)) { WARN("Attempted to send email to address in badhosts: $to"); $email->header_set(to => ''); } + elsif ($recipient->host =~ /\.(?:bugs|tld)$/) { + WARN("Attempted to send email to fake address: $to"); + $email->header_set(to => ''); + } } catch { ERROR($_); }; |