From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/4] mda: support a 'filter=scrub' option for external lists
Date: Sat, 3 Oct 2015 11:14:11 +0000 [thread overview]
Message-ID: <20151003111411.1003-5-e@80x24.org> (raw)
In-Reply-To: <20151003111411.1003-1-e@80x24.org>
For list where we are not the primary archival entry point,
defaulting to filter=scrub makes sense since their list
conventions may be more tolerant of HTML and other crap
than we are.
---
lib/PublicInbox/Config.pm | 2 +-
public-inbox-mda | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 315d788..0d73a86 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 1a9469b..df8ca38 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);
--
EW
prev parent reply other threads:[~2015-10-03 11:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-03 11:14 [PATCH 0/4] misc updates Eric Wong
2015-10-03 11:14 ` [PATCH 1/4] nntpd: executable permission Eric Wong
2015-10-03 11:14 ` [PATCH 2/4] rename mid_compress to id_compress Eric Wong
2015-10-03 11:14 ` [PATCH 3/4] drop Message-IDs longer than 244 bytes Eric Wong
2015-10-03 11:14 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151003111411.1003-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).