diff options
-rw-r--r-- | lib/PublicInbox/Config.pm | 2 | ||||
-rwxr-xr-x | public-inbox-mda | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 315d788b..0d73a867 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -61,7 +61,7 @@ sub lookup { defined $pfx or return; my %rv; - foreach my $k (qw(mainrepo address)) { + foreach my $k (qw(mainrepo address filter)) { my $v = $self->{"$pfx.$k"}; $rv{$k} = $v if defined $v; } diff --git a/public-inbox-mda b/public-inbox-mda index 1a9469ba..df8ca38c 100755 --- a/public-inbox-mda +++ b/public-inbox-mda @@ -38,7 +38,18 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) && $filtered = undef; $filter->simple($msg); - if (PublicInbox::Filter->run($msg, $filter)) { + my $filter_arg; + my $fcfg = $dst->{filter}; + if (!defined $fcfg || $filter eq 'reject') { + $filter_arg = $filter; + } elsif ($fcfg eq 'scrub') { + $filter_arg = undef; # the default for legacy versions + } else { + warn "publicinbox.$dst->{listname}.filter=$fcfg invalid\n"; + warn "must be either 'scrub' or 'reject' (the default)\n"; + } + + if (PublicInbox::Filter->run($msg, $filter_arg)) { # run spamc again on the HTML-free message if (do_spamc($msg, \$filtered)) { $msg = Email::MIME->new(\$filtered); |