mda: add most RFC 2919 and 2369 headers

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

diff --git a/public-inbox-mda b/public-inbox-mda
index 72f1eac4b41f04b6f51eb2bd01bb1b4fc347c323..6e66fa71da63c56ccfcf3cfea5390696ae01e117 100755 (executable)
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -3,20 +3,36 @@
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
+my $usage = 'public-inbox-mda < rfc2822_message';
+
 use Email::Filter;
 use Email::Address;
-use PublicInbox::Filter;
+use File::Path::Expand qw/expand_filename/;
 use IPC::Run qw(run);
-my $usage = "public-inbox-mda main_repo fail_repo < rfc2822_message";
-my $filter = Email::Filter->new(emergency => "~/emergency.mbox");
-my $main_repo = shift @ARGV or die "Usage: $usage\n";
-my $fail_repo = shift @ARGV or die "Usage: $usage\n";
-my $max = 1024 * 500; # same as spamc
-
-my $filtered;
-if (length($filter->simple->as_string) <= $max
-    && PublicInbox->recipient_specified($filter)
-    && do_spamc($filter->simple, \$filtered)) {
+use constant MDA => 'ssoma-mda';
+use PublicInbox;
+use PublicInbox::Filter;
+use PublicInbox::Config;
+
+# n.b: hopefully we can setup the failbox path without bailing due to
+# user error, we really want to setup the emergency destination ASAP
+# in case there's bugs in our code or user error.
+my $failbox = $ENV{PI_FAILBOX} || '~/public-inbox-fail.mbox';
+$failbox = expand_filename($failbox);
+
+# this reads the message from stdin
+my $filter = Email::Filter->new(emergency => $failbox);
+my $config = PublicInbox::Config->new;
+
+my $recipient = $ENV{RECIPIENT};
+defined $recipient or die "RECIPIENT not defined in ENV\n";
+my $dst = $config->lookup($recipient);
+defined $dst or exit(1);
+my $main_repo = $dst->{mainrepo} or exit(1);
+my $filtered; # string dest
+
+if (PublicInbox->precheck($filter, $recipient) &&
+    do_spamc($filter->simple, \$filtered)) {
        # update our message with SA headers (in case our filter rejects it)
        my $simple = Email::Simple->new($filtered);
        $filtered = undef;
@@ -25,21 +41,27 @@ if (length($filter->simple->as_string) <= $max
        if (PublicInbox::Filter->run($simple)) {
                # run spamc again on the HTML-free message
                if (do_spamc($simple, \$filtered)) {
-                       $filter->simple(Email::Simple->new($filtered));
-                       $filter->pipe("ssoma-mda", $main_repo);
-               } else {
-                       $filter->pipe("ssoma-mda", $fail_repo);
+                       $simple = Email::Simple->new($filtered);
+                       set_list_headers($simple, $dst);
+                       $filter->simple($simple);
+
+                       my $from = $filter->from;
+                       my @from = Email::Address->parse($from);
+                       my $name = $from[0]->name;
+                       defined $name or $name = "";
+                       my $email = $from[0]->address;
+                       defined $email or $email = "";
+                       local $ENV{GIT_AUTHOR_NAME} = $name;
+                       local $ENV{GIT_AUTHOR_EMAIL} = $email;
+                       local $ENV{GIT_AUTHOR_DATE} = $simple->header("Date");
+                       local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
+                       local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
+
+                       $filter->pipe(MDA, '-1', $main_repo);
                }
-       } else {
-               # PublicInbox::Filter nuked everything, oops :x
-               $filter->pipe("ssoma-mda", $fail_repo);
        }
-} else {
-       # if SA thinks it's spam or there's an error:
-       # don't bother with our own filtering
-       $filter->pipe("ssoma-mda", $fail_repo);
 }
-die "Email::Filter failed to exit\n";
+exit 0; # goes to failbox
 
 # we depend on "report_safe 0" in /etc/spamassassin/*.cf with --headers
 # not using Email::Filter->pipe here since we want the stdout of
@@ -53,3 +75,17 @@ sub do_spamc {
 
        return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
 }
+
+# RFC2919 and RFC2369
+sub set_list_headers {
+       my ($simple, $dst) = @_;
+       my $pa = "<$dst->{-primary_address}>";
+       $simple->header_set("List-Id", $pa);
+       $simple->header_set("List-Post", $pa);
+
+       my $url = $dst->{url};
+       if (defined $url) {
+               $simple->header_set("List-Archive", "<$url>");
+               $simple->header_set("List-Help", "<${url}help>");
+       }
+}