mda: allow configuring globally without spamc support

[public-inbox.git] / lib / PublicInbox / WatchMaildir.pm

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 2808b7263109ebdf22953a707d38e6cc324e1874..13dea168deb8d5e3a0e4604dd5694f4a865370d6 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -11,7 +11,11 @@ use PublicInbox::Git;
 use PublicInbox::Import;
 use PublicInbox::MDA;
 use PublicInbox::Spawn qw(spawn);
+use PublicInbox::InboxWritable;
 use File::Temp qw//;
+use PublicInbox::Filter::Base;
+use PublicInbox::Spamcheck;
+*REJECT = *PublicInbox::Filter::Base::REJECT;
 
 sub new {
        my ($class, $config) = @_;
@@ -37,19 +41,13 @@ sub new {
        }
 
        my $k = 'publicinboxwatch.spamcheck';
-       my $spamcheck = $config->{$k};
-       if ($spamcheck) {
-               if ($spamcheck eq 'spamc') {
-                       $spamcheck = 'PublicInbox::Spamcheck::Spamc';
-               }
-               if ($spamcheck =~ /::/) {
-                       eval "require $spamcheck";
-                       $spamcheck = _spamcheck_cb($spamcheck->new);
-               } else {
-                       warn "unsupported $k=$spamcheck\n";
-                       $spamcheck = undef;
-               }
-       }
+       my $default = undef;
+       my $spamcheck = PublicInbox::Spamcheck::get($config, $k, $default);
+       $spamcheck = _spamcheck_cb($spamcheck) if $spamcheck;
+
+       # need to make all inboxes writable for spam removal:
+       $config->each_inbox(sub { PublicInbox::InboxWritable->new($_[0]) });
+
        foreach $k (keys %$config) {
                $k =~ /\Apublicinbox\.([^\.]+)\.watch\z/ or next;
                my $name = $1;
@@ -118,9 +116,10 @@ sub _remove_spam {
                eval {
                        my $im = _importer_for($self, $ibx);
                        $im->remove($mime, 'spam');
-                       if (my $scrub = _scrubber_for($ibx)) {
-                               my $scrubbed = $scrub->scrub($mime) or return;
-                               $scrubbed == 100 and return;
+                       if (my $scrub = $ibx->filter) {
+                               my $scrubbed = $scrub->scrub($mime, 1);
+                               $scrubbed or return;
+                               $scrubbed == REJECT() and return;
                                $im->remove($scrubbed, 'spam');
                        }
                };
@@ -133,13 +132,7 @@ sub _remove_spam {
 
 sub _try_path {
        my ($self, $path) = @_;
-       my @p = split(m!/+!, $path);
-       return if $p[-1] !~ /\A[a-zA-Z0-9][\-\w:,=\.]+\z/;
-       if ($p[-1] =~ /:2,([A-Z]+)\z/i) {
-               my $flags = $1;
-               return if $flags =~ /[DT]/; # no [D]rafts or [T]rashed mail
-       }
-       return unless -f $path;
+       return unless PublicInbox::InboxWritable::is_maildir_path($path);
        if ($path !~ $self->{mdre}) {
                warn "unrecognized path: $path\n";
                return;
@@ -154,15 +147,14 @@ sub _try_path {
        }
        my $im = _importer_for($self, $inbox);
        my $mime = _path_to_mime($path) or return;
-       $mime->header_set($_) foreach @PublicInbox::MDA::BAD_HEADERS;
        my $wm = $inbox->{-watchheader};
        if ($wm) {
                my $v = $mime->header_obj->header_raw($wm->[0]);
                return unless ($v && $v =~ $wm->[1]);
        }
-       if (my $scrub = _scrubber_for($inbox)) {
+       if (my $scrub = $inbox->filter) {
                my $ret = $scrub->scrub($mime) or return;
-               $ret == 100 and return;
+               $ret == REJECT() and return;
                $mime = $ret;
        }
 
@@ -253,50 +245,15 @@ sub _path_to_mime {
 }
 
 sub _importer_for {
-       my ($self, $inbox) = @_;
-       my $im = $inbox->{-import} ||= eval {
-               my $v = $inbox->{version} || 1;
-               if ($v == 2) {
-                       eval { require PublicInbox::V2Writable };
-                       die "v2 not supported: $@\n" if $@;
-                       PublicInbox::V2Writable->new($inbox);
-               } elsif ($v == 1) {
-                       my $git = $inbox->git;
-                       my $name = $inbox->{name};
-                       my $addr = $inbox->{-primary_address};
-                       PublicInbox::Import->new($git, $name, $addr, $inbox);
-               } else {
-                       die "unsupported inbox version: $v\n";
-               }
-       };
-
+       my ($self, $ibx) = @_;
        my $importers = $self->{importers};
+       my $im = $importers->{"$ibx"} ||= $ibx->importer(0);
        if (scalar(keys(%$importers)) > 2) {
-               delete $importers->{"$im"};
+               delete $importers->{"$ibx"};
                _done_for_now($self);
        }
 
-       $importers->{"$im"} = $im;
-}
-
-sub _scrubber_for {
-       my ($inbox) = @_;
-       my $f = $inbox->{filter};
-       if ($f && $f =~ /::/) {
-               my @args = (-inbox => $inbox);
-               # basic line splitting, only
-               # Perhaps we can have proper quote splitting one day...
-               ($f, @args) = split(/\s+/, $f) if $f =~ /\s+/;
-
-               eval "require $f";
-               if ($@) {
-                       warn $@;
-               } else {
-                       # e.g: PublicInbox::Filter::Vger->new(@args)
-                       return $f->new(@args);
-               }
-       }
-       undef;
+       $importers->{"$ibx"} = $im;
 }
 
 sub _spamcheck_cb {