examples/public-inbox.psgi: shorten to simplify

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

diff --git a/public-inbox-mda b/public-inbox-mda
index c4822b6180e6124b84991bffbd25905dac857c4a..73c4ae1ceaa862bb01f888c50f7faaaacfa79ba6 100755 (executable)
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+#
+# Mail delivery agent for public-inbox, run from your MTA upon mail delivery
 use strict;
 use warnings;
 my $usage = 'public-inbox-mda < rfc2822_message';
@@ -38,7 +40,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);
@@ -64,7 +77,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
 } else {
        # Ensure emergency spam gets spamassassin headers.
        # This makes it easier to prioritize obvious spam from less obvious
-       if (defined($filtered) && length($filtered)) {
+       if (defined($filtered) && $filtered ne '') {
                my $drop = Email::MIME->new(\$filtered);
                $filtered = undef;
                $filter->simple($drop);
@@ -82,7 +95,7 @@ sub do_spamc {
                run([qw/spamc -E --headers/], \$orig, $out);
        };
 
-       return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
+       return ($@ || $? || !defined($$out) || $$out eq '') ? 0 : 1;
 }
 
 sub search_index_sync {