X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=script%2Fpublic-inbox-mda;h=7e2bee92096e877ae40e34eb847e8149f933eb2e;hp=26b70cfb6cfc8f2fc7d4631b829648e0e34d068f;hb=refs%2Fheads%2Fmaster;hpb=aad496f4336e6a7b60312b0eef1a88b9527322bb diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 26b70cfb..7e2bee92 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -1,117 +1,144 @@ #!/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-2021 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 Email::MIME; -use Email::MIME::ContentType; -$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect +use PublicInbox::Eml; use PublicInbox::MDA; use PublicInbox::Config; -use PublicInbox::Import; -use PublicInbox::Git; use PublicInbox::Emergency; use PublicInbox::Filter::Base; -use PublicInbox::Spawn qw(popen_rd); +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 # 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 $config = PublicInbox::Config->new; - +my $eml = PublicInbox::Eml->new(\$str); +my $cfg = PublicInbox::Config->new; +my $key = 'publicinboxmda.spamcheck'; +my $default = 'PublicInbox::Spamcheck::Spamc'; +my $spamc = PublicInbox::Spamcheck::get($cfg, $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 = $cfg->lookup($recipient); # first check + push @$dests, $ibx if $ibx; +} +if (!scalar(@$dests)) { + $dests = PublicInbox::MDA->inboxes_for_list_id($cfg, $eml); + 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 +} -# pre-check, MDA has stricter rules than an importer might; -do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address}); +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; -$str = ''; -my $spam_ok = do_spamc($ems->fh, \$str); -$simple = undef; -$emm = PublicInbox::Emergency->new($emergency); -$emm->prepare(\$str); -$ems = $ems->abort; -my $mime = Email::MIME->new(\$str); -$str = ''; -do_exit(0) unless $spam_ok; +$do_exit->(67) if $err && scalar(@$dests) == 0; -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; +$eml = undef; +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 $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 - -PublicInbox::MDA->set_list_headers($mime, $dst); -END { index_sync($main_repo) if $? == 0 }; -my $git = PublicInbox::Git->new($main_repo); -my $im = PublicInbox::Import->new($git, $dst->{name}, $recipient); -if (defined $im->add($mime)) { - $im->done; - $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"; +# -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'; + } } -do_exit(0); -# we depend on "report_safe 0" in /etc/spamassassin/*.cf with --headers -sub do_spamc { - my ($in, $out) = @_; - my $rdr = { 0 => fileno($in) }; - my ($fh, $pid) = popen_rd([qw/spamc -E --headers/], undef, $rdr); - my $r; - do { - $r = sysread($fh, $$out, 65536, length($$out)); - } while (defined($r) && $r != 0); - close $fh or die "close failed: $!\n"; - waitpid($pid, 0); +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; + } - ($? || $$out eq '') ? 0 : 1; + 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; } -sub index_sync { - my ($git_dir) = @_; - eval { - require PublicInbox::SearchIdx; - PublicInbox::SearchIdx->new($git_dir, 2)->index_sync; - }; +if (scalar(@rejects) && scalar(@rejects) == scalar(@$dests)) { + $! = 65; # EX_DATAERR 5.6.0 data format error + die join("\n", @rejects, ''); } + +$do_exit->(0);