diff options
Diffstat (limited to 'script/public-inbox-mda')
| -rwxr-xr-x | script/public-inbox-mda | 154 |
1 files changed, 69 insertions, 85 deletions
diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 24feeb81..8b5258f5 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -6,106 +6,90 @@ use strict; use warnings; my $usage = 'public-inbox-mda < rfc2822_message'; +my ($ems, $emm); -use Email::Filter; +sub do_exit { + my ($code) = shift; + $emm = $ems = undef; # trigger DESTROY + exit $code; +} + +use Email::Simple; use Email::MIME; -use Email::Address; -use File::Path::Expand qw/expand_filename/; -use IPC::Run qw(run); +use Email::MIME::ContentType; +$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect 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 $/; <STDIN> }; +$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->{listname}.filter=$fcfg invalid\n"; - warn "must be either 'scrub' or 'reject' (the default)\n"; - } - - 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); - - my ($name, $email, $date) = - PublicInbox::MDA->author_info($msg); - - END { - index_sync($main_repo) if ($? == 0); - }; - - local $ENV{GIT_AUTHOR_NAME} = $name; - local $ENV{GIT_AUTHOR_EMAIL} = $email; - local $ENV{GIT_AUTHOR_DATE} = $date; - local $ENV{GIT_COMMITTER_EMAIL} = $recipient; - local $ENV{GIT_COMMITTER_NAME} = $dst->{listname}; - - $filter->pipe(PublicInbox::MDA->cmd, $main_repo); - } - } +defined $dst or do_exit(1); +my $main_repo = $dst->{mainrepo} or do_exit(1); + +# 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 = Email::MIME->new(\$str); +$str = ''; +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 { - # 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); - }; - - return ($@ || $? || !defined($$out) || $$out eq '') ? 0 : 1; +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); +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"; } -sub index_sync { - my ($git_dir) = @_; - - # potentially user-visible, ignore errors: - system('git', "--git-dir=$git_dir", 'update-server-info'); - - eval { - require PublicInbox::SearchIdx; - PublicInbox::SearchIdx->new($git_dir, 2)->index_sync; - }; -} +$im->done; +do_exit(0); |