X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-mda;h=3ed5abb6d910dfb76b586a5fbd4dfb4ca9dfa024;hb=4f1a683dc895a7bd4cf79e58b39faea256045921;hp=2655a6c5ed064aad67b97f0c575a3212cde68344;hpb=7e881ac8227d1882c92de6f6701ffcba7cef9191;p=public-inbox.git
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 2655a6c5..3ed5abb6 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -1,21 +1,31 @@
#!/usr/bin/perl -w
-# Copyright (C) 2013-2019 all contributors
+# Copyright (C) 2013-2020 all contributors
# License: AGPL-3.0+
#
# Mail delivery agent for public-inbox, run from your MTA upon mail delivery
+my $help = < \$precheck, 'help|h' => \$show_help) or
+ do { print STDERR $help; exit 1 };
-sub do_exit {
+my $do_exit = sub {
my ($code) = shift;
$emm = $ems = undef; # trigger DESTROY
exit $code;
-}
+};
-use Email::Simple;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::MDA;
use PublicInbox::Config;
use PublicInbox::Emergency;
@@ -28,35 +38,47 @@ use PublicInbox::Spamcheck;
# in case there's bugs in our code or user error.
my $emergency = $ENV{PI_EMERGENCY} || "$ENV{HOME}/.public-inbox/emergency/";
$ems = PublicInbox::Emergency->new($emergency);
-my $str = eval { local $/; };
+my $str = do { local $/; };
$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
$ems->prepare(\$str);
-my $simple = Email::Simple->new(\$str);
+my $eml = PublicInbox::Eml->new(\$str);
my $config = PublicInbox::Config->new;
my $key = 'publicinboxmda.spamcheck';
my $default = 'PublicInbox::Spamcheck::Spamc';
my $spamc = PublicInbox::Spamcheck::get($config, $key, $default);
-my $dst;
+my $dests = [];
my $recipient = $ENV{ORIGINAL_RECIPIENT};
if (defined $recipient) {
- $dst = $config->lookup($recipient); # first check
+ my $ibx = $config->lookup($recipient); # first check
+ push @$dests, $ibx if $ibx;
}
-if (!defined $dst) {
- my $list_id = $simple->header('List-Id');
- if (defined $list_id && $list_id =~ /<[ \t]*(.+)?[ \t]*>/) {
- $dst = $config->lookup_list_id($1);
- }
- if (!defined $dst && !defined $recipient) {
+if (!scalar(@$dests)) {
+ $dests = PublicInbox::MDA->inboxes_for_list_id($config, $eml);
+ if (!scalar(@$dests) && !defined($recipient)) {
die "ORIGINAL_RECIPIENT not defined in ENV\n";
}
- defined $dst or do_exit(67); # EX_NOUSER 5.1.1 user unknown
+ scalar(@$dests) or $do_exit->(67); # EX_NOUSER 5.1.1 user unknown
}
-$dst->{mainrepo} or do_exit(67);
-$dst = PublicInbox::InboxWritable->new($dst);
-# pre-check, MDA has stricter rules than an importer might;
-do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address});
-$simple = undef;
+my $err;
+@$dests = grep {
+ my $ibx = PublicInbox::InboxWritable->new($_);
+ eval { $ibx->assert_usable_dir };
+ if ($@) {
+ warn $@;
+ $err = 1;
+ 0;
+ # pre-check, MDA has stricter rules than an importer might;
+ } elsif ($precheck) {
+ !!PublicInbox::MDA->precheck($eml, $ibx->{address});
+ } else {
+ 1;
+ }
+} @$dests;
+
+$do_exit->(67) if $err && scalar(@$dests) == 0;
+
+$eml = undef;
my $spam_ok;
if ($spamc) {
$str = '';
@@ -71,39 +93,52 @@ if ($spamc) {
my $fh = $emm->fh;
read($fh, $str, -s $fh);
}
+$do_exit->(0) unless $spam_ok;
-my $mime = PublicInbox::MIME->new(\$str);
-do_exit(0) unless $spam_ok;
+# -mda defaults to the strict base filter which we won't use anywhere else
+sub mda_filter_adjust ($) {
+ my ($ibx) = @_;
+ my $fcfg = $ibx->{filter} || '';
+ if ($fcfg eq '') {
+ $ibx->{filter} = 'PublicInbox::Filter::Base';
+ } elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove?
+ $ibx->{filter} = 'PublicInbox::Filter::Mirror';
+ }
+}
+
+my @rejects;
+for my $ibx (@$dests) {
+ mda_filter_adjust($ibx);
+ my $filter = $ibx->filter;
+ my $mime = PublicInbox::Eml->new($str);
+ my $ret = $filter->delivery($mime);
+ if (ref($ret) && ($ret->isa('PublicInbox::Eml') ||
+ $ret->isa('Email::MIME'))) { # filter altered message
+ $mime = $ret;
+ } elsif ($ret == PublicInbox::Filter::Base::IGNORE) {
+ next; # nothing, keep looping
+ } elsif ($ret == PublicInbox::Filter::Base::REJECT) {
+ push @rejects, $filter->err;
+ next;
+ }
-my $fcfg = $dst->{filter} || '';
-# -mda defaults to the strict base filter
-if ($fcfg eq '') {
- $dst->{filter} = 'PublicInbox::Filter::Base';
-} elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove?
- $dst->{filter} = 'PublicInbox::Filter::Mirror';
+ PublicInbox::MDA->set_list_headers($mime, $ibx);
+ my $im = $ibx->importer(0);
+ if (defined $im->add($mime)) {
+ # ->abort is idempotent, no emergency if a single
+ # destination succeeds
+ $emm->abort;
+ } else { # v1-only
+ my $mid = $mime->header_raw('Message-ID');
+ # this message is similar to what ssoma-mda shows:
+ print STDERR "CONFLICT: Message-ID: $mid exists\n";
+ }
+ $im->done;
}
-my $filter = $dst->filter;
-my $ret = $filter->delivery($mime);
-if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message
- $mime = $ret;
-} elsif ($ret == PublicInbox::Filter::Base::IGNORE) {
- do_exit(0); # chuck it to emergency
-} elsif ($ret == PublicInbox::Filter::Base::REJECT) {
- $! = 65; # EX_DATAERR 5.6.0 data format error
- die $filter->err, "\n";
-} # else { accept
-$filter = undef;
-PublicInbox::MDA->set_list_headers($mime, $dst);
-my $im = $dst->importer(0);
-if (defined $im->add($mime)) {
- $emm = $emm->abort;
-} else {
- # this message is similar to what ssoma-mda shows:
- print STDERR "CONFLICT: Message-ID: ",
- $mime->header_obj->header_raw('Message-ID'),
- " exists\n";
+if (scalar(@rejects) && scalar(@rejects) == scalar(@$dests)) {
+ $! = 65; # EX_DATAERR 5.6.0 data format error
+ die join("\n", @rejects, '');
}
-$im->done;
-do_exit(0);
+$do_exit->(0);