X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-mda;h=766d58a6f4c22cd97ca91a9fda6dc7bd421d8bca;hb=e350de7fdbe12dafc36e893e66ce8c93ec6dc3f2;hp=bb78c4e605ff72fa13619e1d7e1206a5c88f9925;hpb=1cf14fe543ad6259003cdd1995a1c83a7a70b535;p=public-inbox.git diff --git a/script/public-inbox-mda b/script/public-inbox-mda index bb78c4e6..766d58a6 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -1,110 +1,103 @@ #!/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-2018 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 ($ems, $emm); -use Email::Filter; -use Email::MIME; -use Email::MIME::ContentType; -$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect -use File::Path::Expand qw/expand_filename/; -use IPC::Run qw(run); +sub do_exit { + my ($code) = shift; + $emm = $ems = undef; # trigger DESTROY + exit $code; +} + +use Email::Simple; +use PublicInbox::MIME; use PublicInbox::MDA; -use PublicInbox::Filter; use PublicInbox::Config; use PublicInbox::Import; use PublicInbox::Git; +use PublicInbox::Emergency; +use PublicInbox::Filter::Base; +use PublicInbox::Spamcheck::Spamc; # 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} || '~/.public-inbox/emergency/'; -$emergency = expand_filename($emergency); - -# this reads the message from stdin -my $filter = Email::Filter->new(emergency => $emergency); +my $emergency = $ENV{PI_EMERGENCY} || "$ENV{HOME}/.public-inbox/emergency/"; +$ems = PublicInbox::Emergency->new($emergency); +my $str = eval { 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 $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 exit(1); -my $main_repo = $dst->{mainrepo} or exit(1); -my $filtered; # string dest - -if (PublicInbox::MDA->precheck($filter, $dst->{address}) && - do_spamc($filter->simple, \$filtered)) { - # update our message with SA headers (in case our filter rejects it) - my $msg = Email::MIME->new(\$filtered); - $filtered = undef; - $filter->simple($msg); - - 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->{name}.filter=$fcfg invalid\n"; - warn "must be either 'scrub' or 'reject' (the default)\n"; - } +defined $dst or do_exit(1); +my $main_repo = $dst->{mainrepo} or do_exit(1); - 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); - PublicInbox::MDA->set_list_headers($msg, $dst); - $filter->simple($msg); +# 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; - 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($msg)) { - $im->done; - $filter->ignore; # exits - } - # this message is similar to what ssoma-mda shows: - print STDERR "CONFLICT: Message-ID: ", - $msg->header_obj->header_raw('Message-ID'), - " exists\n"; - } - } +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 { - # Ensure emergency spam gets spamassassin headers. - # This makes it easier to prioritize obvious spam from less obvious - if (defined($filtered) && $filtered ne '') { - my $drop = Email::MIME->new(\$filtered); - $filtered = undef; - $filter->simple($drop); - } + $filter = PublicInbox::Filter::Base->new; } -exit 0; # goes to emergency -# we depend on "report_safe 0" in /etc/spamassassin/*.cf with --headers -# not using Email::Filter->pipe here since we want the stdout of -# the command even on failure (spamc will set $? on error). -sub do_spamc { - my ($msg, $out) = @_; - eval { - my $orig = $msg->as_string; - run([qw/spamc -E --headers/], \$orig, $out); - }; +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 - return ($@ || $? || !defined($$out) || $$out eq '') ? 0 : 1; +PublicInbox::MDA->set_list_headers($mime, $dst); +my $v = $dst->{version} || 1; +my $im; +if ($v == 2) { + require PublicInbox::V2Writable; + $im = PublicInbox::V2Writable->new($dst); + $im->{parallel} = 0; # pointless to be parallel for a single message +} elsif ($v == 1) { + my $git = $dst->git; + $im = PublicInbox::Import->new($git, $dst->{name}, $recipient, $dst); +} else { + die "Unsupported inbox version: $v\n"; } - -sub index_sync { - my ($git_dir) = @_; - eval { - require PublicInbox::SearchIdx; - PublicInbox::SearchIdx->new($git_dir, 2)->index_sync; - }; +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"; } + +$im->done; +do_exit(0);