byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the badmailfrom plugin support (optional) rejection messages after the

Browse Source 
rejection pattern (Robin Hugh Johnson)



git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@697 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Ask Bjørn Hansen 2006-12-18 10:45:25 +00:00
parent e31d3e3e4b
commit cab7466c08
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@ -2,6 +2,9 @@
Support "module" plugins ("My::Plugin" in the config/plugins file) Support "module" plugins ("My::Plugin" in the config/plugins file)
Make the badmailfrom plugin support (optional) rejection messages after the
rejection pattern (Robin Hugh Johnson)
The ill-named $transaction->body_size() is depreceated now, use The ill-named $transaction->body_size() is depreceated now, use
$transaction->data_size() instead. Check your logs for LOGWARN messages $transaction->data_size() instead. Check your logs for LOGWARN messages
about "body_size" and fix your plugins. (Hanno Hecker) about "body_size" and fix your plugins. (Hanno Hecker)

10
plugins/check_badmailfrom
View File

@ -1,7 +1,7 @@
# -*- perl -*- # -*- perl -*-
=head1 NAME =head1 NAME
check_badmailfrom - checks the standard badmailfrom config check_badmailfrom - checks the badmailfrom config, with per-line reasons
=head1 DESCRIPTION =head1 DESCRIPTION
@ -13,6 +13,9 @@ recipient address for a message if the envelope sender address is
listed in badmailfrom. A line in badmailfrom may be of the form listed in badmailfrom. A line in badmailfrom may be of the form
@host, meaning every address at host." @host, meaning every address at host."
You may optionally include a message after the sender address (leave a space),
which is used when rejecting the sender.
=head1 NOTES =head1 NOTES
According to the SMTP protocol, we can't reject until after the RCPT According to the SMTP protocol, we can't reject until after the RCPT
@ -33,11 +36,14 @@ sub hook_mail {
my $from = lc($sender->user) . '@' . $host; my $from = lc($sender->user) . '@' . $host;
for my $bad (@badmailfrom) { for my $bad (@badmailfrom) {
my $reason = $bad;
$reason =~ s/^\s*(\S+)[\t\s]+//;
$reason = "sorry, your envelope sender is in my badmailfrom list" unless $reason;
$bad =~ s/^\s*(\S+).*/$1/; $bad =~ s/^\s*(\S+).*/$1/;
next unless $bad; next unless $bad;
$bad = lc $bad; $bad = lc $bad;
$self->log(LOGWARN, "Bad badmailfrom config: No \@ sign in $bad") and next unless $bad =~ m/\@/; $self->log(LOGWARN, "Bad badmailfrom config: No \@ sign in $bad") and next unless $bad =~ m/\@/;
$transaction->notes('badmailfrom', "sorry, your envelope sender is in my badmailfrom list") $transaction->notes('badmailfrom', $reason)
if ($bad eq $from) || (substr($bad,0,1) eq '@' && $bad eq "\@$host"); if ($bad eq $from) || (substr($bad,0,1) eq '@' && $bad eq "\@$host");
} }
return (DECLINED); return (DECLINED);