diff options
author | Eric Wong <e@80x24.org> | 2016-06-16 22:45:26 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-06-17 00:21:53 +0000 |
commit | 160a6d5672fef64c174c8d79c07851eaadf6d0e6 (patch) | |
tree | df5b96699d3e8082df5a9ba5e55db6705aff3b29 /lib/PublicInbox/Filter | |
parent | 221d916965ccd55e0aa3e83819f8a05df1a5dcb6 (diff) | |
download | public-inbox-160a6d5672fef64c174c8d79c07851eaadf6d0e6.tar.gz |
We will scrub for importing archives, so ensure it is usable outside of the delivery routine.
Diffstat (limited to 'lib/PublicInbox/Filter')
-rw-r--r-- | lib/PublicInbox/Filter/Base.pm | 9 | ||||
-rw-r--r-- | lib/PublicInbox/Filter/Vger.pm | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/PublicInbox/Filter/Base.pm b/lib/PublicInbox/Filter/Base.pm index 0991e874..37f1ee7e 100644 --- a/lib/PublicInbox/Filter/Base.pm +++ b/lib/PublicInbox/Filter/Base.pm @@ -62,6 +62,13 @@ sub reject ($$) { sub err ($) { $_[0]->{err} } +# by default, scrub is a no-op, see PublicInbox::Filter::Vger::scrub +# for an example of the override +sub scrub { + my ($self, $mime) = @_; + $self->ACCEPT($mime); +} + # for MDA sub delivery { my ($self, $mime) = @_; @@ -94,7 +101,7 @@ sub delivery { push @r, 'Rejected suffixes(s): '.join(', ', sort keys %sfx); } - @r ? $self->reject(join("\n", @r)) : $self->ACCEPT; + @r ? $self->reject(join("\n", @r)) : $self->scrub($mime); } 1; diff --git a/lib/PublicInbox/Filter/Vger.pm b/lib/PublicInbox/Filter/Vger.pm index 9498081a..2ffed184 100644 --- a/lib/PublicInbox/Filter/Vger.pm +++ b/lib/PublicInbox/Filter/Vger.pm @@ -17,7 +17,7 @@ my $l3 = # only LKML had this, and LKML nowadays has no list trailer since Jan 2016 my $l4 = qr!Please read the FAQ at +http://www\.tux\.org/lkml/!; -sub delivery { +sub scrub { my ($self, $mime) = @_; my $s = $mime->as_string; @@ -30,4 +30,9 @@ sub delivery { $self->ACCEPT($mime); } +sub delivery { + my ($self, $mime) = @_; + $self->scrub($mime); +} + 1; |