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

Badmailfromto whitespace (#273)

Browse Source 
* Fix Can't call method 'notes' on unblessed reference in plugins/logging/file.

* Allow white space rather than just a single tab character in the badmailfromto configuration file.
This commit is contained in:
Hans Salvisberg 2016-10-02 19:40:51 +02:00 committed by Matt Simerson
parent 494dc95b72
commit 4e8cb7baf5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/badmailfromto
View File

@ -8,7 +8,7 @@ badmailfromto - checks the badmailfromto config
Much like the similar badmailfrom, this plugin references both the Much like the similar badmailfrom, this plugin references both the
FROM: and TO: lines, and if they both are present in the badmailfromto FROM: and TO: lines, and if they both are present in the badmailfromto
config file (a tab delimited list of FROM/TO pairs), then the message is config file (a whitespace-delimited list of FROM/TO pairs), then the message is
blocked as if the recipient (TO) didn't exist. This is specifically designed blocked as if the recipient (TO) didn't exist. This is specifically designed
to not give the impression that the sender is blocked (good for cases of to not give the impression that the sender is blocked (good for cases of
harassment). harassment).
@ -54,7 +54,7 @@ sub hook_rcpt {
}; };
foreach ($self->qp->config("badmailfromto")) { foreach ($self->qp->config("badmailfromto")) {
my ($from, $to) = m/^\s*(\S+)\t(\S+).*/; my ($from, $to) = m/^\s*(\S+)\s+(\S+).*/;
if ( lc($from) eq $sender && lc($to) eq $recipient ) { if ( lc($from) eq $sender && lc($to) eq $recipient ) {
return DENY, "mail to $recipient not accepted here"; return DENY, "mail to $recipient not accepted here";
} }