search: implement index_sync to fixup indexer

[public-inbox.git] / public-inbox-mda

diff --git a/public-inbox-mda b/public-inbox-mda
index 50805da2e6ecc99b679cc69dacfea1caa6e37e21..4348cb244510113a2cb40d0ca8e5eac0e9be13cb 100755 (executable)
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -26,22 +26,22 @@ my $config = PublicInbox::Config->new;
 
 my $recipient = $ENV{ORIGINAL_RECIPIENT};
 defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n";
-my $dst = $config->lookup($recipient);
+my $dst = $config->lookup($recipient); # first check
 defined $dst or exit(1);
 my $main_repo = $dst->{mainrepo} or exit(1);
 my $filtered; # string dest
 
-if (PublicInbox::MDA->precheck($filter, $recipient) &&
+if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
     do_spamc($filter->simple, \$filtered)) {
        # update our message with SA headers (in case our filter rejects it)
-       my $msg = Email::Simple->new($filtered);
+       my $msg = Email::MIME->new(\$filtered);
        $filtered = undef;
        $filter->simple($msg);
 
-       if (PublicInbox::Filter->run($msg)) {
+       if (PublicInbox::Filter->run($msg, $filter)) {
                # run spamc again on the HTML-free message
                if (do_spamc($msg, \$filtered)) {
-                       $msg = Email::MIME->new($filtered);
+                       $msg = Email::MIME->new(\$filtered);
                        PublicInbox::MDA->set_list_headers($msg, $dst);
                        $filter->simple($msg);
 
@@ -56,6 +56,14 @@ if (PublicInbox::MDA->precheck($filter, $recipient) &&
                        $filter->pipe(PublicInbox::MDA->cmd, $main_repo);
                }
        }
+} else {
+       # Ensure emergency spam gets spamassassin headers.
+       # This makes it easier to prioritize obvious spam from less obvious
+       if (defined($filtered) && length($filtered)) {
+               my $drop = Email::MIME->new(\$filtered);
+               $filtered = undef;
+               $filter->simple($drop);
+       }
 }
 exit 0; # goes to emergency