X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-mda;h=f37c74925f05383273535f58d6394443bd76af8b;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=60f817dc08d4afb4f64ef0667da789dc38af889f;hpb=3fc59df0d633a17e0c5e43d633d12e8772c06ec3;p=public-inbox.git diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 60f817dc..f37c7492 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -1,30 +1,28 @@ #!/usr/bin/perl -w -# Copyright (C) 2013-2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2013-2020 all contributors +# License: AGPL-3.0+ # # Mail delivery agent for public-inbox, run from your MTA upon mail delivery use strict; use warnings; -my $usage = 'public-inbox-mda < rfc2822_message'; +my $usage = 'public-inbox-mda [OPTIONS] < rfc2822_message'; +my $precheck = grep(/\A--no-precheck\z/, @ARGV) ? 0 : 1; my ($ems, $emm); -sub do_exit { +my $do_exit = sub { my ($code) = shift; $emm = $ems = undef; # trigger DESTROY exit $code; -} +}; use Email::Simple; -use Email::MIME; -use Email::MIME::ContentType; -$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect +use PublicInbox::MIME; use PublicInbox::MDA; use PublicInbox::Config; -use PublicInbox::Import; -use PublicInbox::Git; use PublicInbox::Emergency; use PublicInbox::Filter::Base; -use PublicInbox::Spamcheck::Spamc; +use PublicInbox::InboxWritable; +use PublicInbox::Spamcheck; # n.b: hopefully we can setup the emergency path without bailing due to # user error, we really want to setup the emergency destination ASAP @@ -36,60 +34,101 @@ $str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; $ems->prepare(\$str); my $simple = Email::Simple->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 $dests = []; my $recipient = $ENV{ORIGINAL_RECIPIENT}; -defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n"; -my $dst = $config->lookup($recipient); # first check -defined $dst or do_exit(1); -my $main_repo = $dst->{mainrepo} or do_exit(1); +if (defined $recipient) { + my $ibx = $config->lookup($recipient); # first check + push @$dests, $ibx if $ibx; +} +if (!scalar(@$dests)) { + $dests = PublicInbox::MDA->inboxes_for_list_id($config, $simple); + if (!scalar(@$dests) && !defined($recipient)) { + die "ORIGINAL_RECIPIENT not defined in ENV\n"; + } + scalar(@$dests) or $do_exit->(67); # EX_NOUSER 5.1.1 user unknown +} + +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($simple, $ibx->{address}); + } else { + 1; + } +} @$dests; + +$do_exit->(67) if $err && scalar(@$dests) == 0; -# pre-check, MDA has stricter rules than an importer might; -do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address}); -my $spamc = PublicInbox::Spamcheck::Spamc->new; -$str = ''; -my $spam_ok = $spamc->spamcheck($ems->fh, \$str); $simple = undef; -$emm = PublicInbox::Emergency->new($emergency); -$emm->prepare(\$str); -$ems = $ems->abort; -my $mime = PublicInbox::MIME->new(\$str); -$str = ''; -do_exit(0) unless $spam_ok; +my $spam_ok; +if ($spamc) { + $str = ''; + $spam_ok = $spamc->spamcheck($ems->fh, \$str); + # update the emergency dump with the new message: + $emm = PublicInbox::Emergency->new($emergency); + $emm->prepare(\$str); + $ems = $ems->abort; +} else { # no spam checking configured: + $spam_ok = 1; + $emm = $ems; + my $fh = $emm->fh; + read($fh, $str, -s $fh); +} +$do_exit->(0) unless $spam_ok; -my $fcfg = $dst->{filter} || ''; -my $filter; -if ($fcfg =~ /::/) { - eval "require $fcfg"; - die $@ if $@; - $filter = $fcfg->new; -} elsif ($fcfg eq 'scrub') { # TODO: - require PublicInbox::Filter::Mirror; - $filter = PublicInbox::Filter::Mirror->new; -} else { - $filter = PublicInbox::Filter::Base->new; +# -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 $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) { - $! = $ret; - die $filter->err, "\n"; -} # else { accept +my @rejects; +for my $ibx (@$dests) { + mda_filter_adjust($ibx); + my $filter = $ibx->filter; + my $mime = PublicInbox::MIME->new($str); + my $ret = $filter->delivery($mime); + if (ref($ret) && $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; + } + + 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_obj->header_raw('Message-ID'); + # this message is similar to what ssoma-mda shows: + print STDERR "CONFLICT: Message-ID: $mid exists\n"; + } + $im->done; +} -PublicInbox::MDA->set_list_headers($mime, $dst); -my $git = PublicInbox::Git->new($main_repo); -my $im = PublicInbox::Import->new($git, $dst->{name}, $recipient); -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);