No ext_urls

[public-inbox.git] / script / public-inbox-mda

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 821bd9cca36bb00d33d074c0c8e37d22f3387be5..7e2bee92096e877ae40e34eb847e8149f933eb2e 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -1,22 +1,31 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Mail delivery agent for public-inbox, run from your MTA upon mail delivery
+my $help = <<EOF;
+usage: public-inbox-mda [OPTIONS] </path/to/RFC2822_message
+
+options:
+
+  --no-precheck  skip internal checks for spam messages
+
+See public-inbox-mda(1) man page for full documentation.
+EOF
 use strict;
-use warnings;
-my $usage = 'public-inbox-mda [OPTIONS] < rfc2822_message';
-my $precheck = grep(/\A--no-precheck\z/, @ARGV) ? 0 : 1;
-my ($ems, $emm);
+use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
+my ($ems, $emm, $show_help);
+my $precheck = 1;
+GetOptions('precheck!' => \$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;
@@ -29,27 +38,26 @@ 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 $/; <STDIN> };
+my $str = do { 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 $eml = PublicInbox::Eml->new(\$str);
+my $cfg = PublicInbox::Config->new;
 my $key = 'publicinboxmda.spamcheck';
 my $default = 'PublicInbox::Spamcheck::Spamc';
-my $spamc = PublicInbox::Spamcheck::get($config, $key, $default);
+my $spamc = PublicInbox::Spamcheck::get($cfg, $key, $default);
 my $dests = [];
 my $recipient = $ENV{ORIGINAL_RECIPIENT};
 if (defined $recipient) {
-       my $ibx = $config->lookup($recipient); # first check
+       my $ibx = $cfg->lookup($recipient); # first check
        push @$dests, $ibx if $ibx;
 }
 if (!scalar(@$dests)) {
-       my $ibx = PublicInbox::MDA->inbox_for_list_id($config, $simple);
-       if (!defined($ibx) && !defined($recipient)) {
+       $dests = PublicInbox::MDA->inboxes_for_list_id($cfg, $eml);
+       if (!scalar(@$dests) && !defined($recipient)) {
                die "ORIGINAL_RECIPIENT not defined in ENV\n";
        }
-       defined($ibx) or do_exit(67); # EX_NOUSER 5.1.1 user unknown
-       push @$dests, $ibx;
+       scalar(@$dests) or $do_exit->(67); # EX_NOUSER 5.1.1 user unknown
 }
 
 my $err;
@@ -62,15 +70,15 @@ my $err;
                0;
        # pre-check, MDA has stricter rules than an importer might;
        } elsif ($precheck) {
-               !!PublicInbox::MDA->precheck($simple, $ibx->{address});
+               !!PublicInbox::MDA->precheck($eml, $ibx->{address});
        } else {
                1;
        }
 } @$dests;
 
-do_exit(67) if $err && scalar(@$dests) == 0;
+$do_exit->(67) if $err && scalar(@$dests) == 0;
 
-$simple = undef;
+$eml = undef;
 my $spam_ok;
 if ($spamc) {
        $str = '';
@@ -85,7 +93,7 @@ if ($spamc) {
        my $fh = $emm->fh;
        read($fh, $str, -s $fh);
 }
-do_exit(0) unless $spam_ok;
+$do_exit->(0) unless $spam_ok;
 
 # -mda defaults to the strict base filter which we won't use anywhere else
 sub mda_filter_adjust ($) {
@@ -102,9 +110,10 @@ my @rejects;
 for my $ibx (@$dests) {
        mda_filter_adjust($ibx);
        my $filter = $ibx->filter;
-       my $mime = PublicInbox::MIME->new($str);
+       my $mime = PublicInbox::Eml->new($str);
        my $ret = $filter->delivery($mime);
-       if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message
+       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
@@ -120,7 +129,7 @@ for my $ibx (@$dests) {
                # destination succeeds
                $emm->abort;
        } else { # v1-only
-               my $mid = $mime->header_obj->header_raw('Message-ID');
+               my $mid = $mime->header_raw('Message-ID');
                # this message is similar to what ssoma-mda shows:
                print STDERR "CONFLICT: Message-ID: $mid exists\n";
        }
@@ -132,4 +141,4 @@ if (scalar(@rejects) && scalar(@rejects) == scalar(@$dests)) {
        die join("\n", @rejects, '');
 }
 
-do_exit(0);
+$do_exit->(0);