inboxwritable: add assert_usable_dir sub

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

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 584218b54c5a179d9b4adb86e0ef0caabf40f8de..c122984f49bdb06dc3e64d6c208e6517ce06f8f2 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -43,17 +43,16 @@ if (defined $recipient) {
        $dst = $config->lookup($recipient); # first check
 }
 if (!defined $dst) {
-       my $list_id = $simple->header('List-Id');
-       if (defined $list_id && $list_id =~ /<[ \t]*(.+)?[ \t]*>/) {
-               $dst = $config->lookup_list_id($1);
-       }
+       $dst = PublicInbox::MDA->inbox_for_list_id($config, $simple);
        if (!defined $dst && !defined $recipient) {
                die "ORIGINAL_RECIPIENT not defined in ENV\n";
        }
        defined $dst or do_exit(67); # EX_NOUSER 5.1.1 user unknown
 }
-$dst->{inboxdir} or do_exit(67);
+
 $dst = PublicInbox::InboxWritable->new($dst);
+eval { $dst->assert_usable_dir };
+do_exit(67) if $@;
 
 # pre-check, MDA has stricter rules than an importer might;
 if ($precheck && !PublicInbox::MDA->precheck($simple, $dst->{address})) {
@@ -74,17 +73,23 @@ if ($spamc) {
        my $fh = $emm->fh;
        read($fh, $str, -s $fh);
 }
+do_exit(0) unless $spam_ok;
 
 my $mime = PublicInbox::MIME->new(\$str);
-do_exit(0) unless $spam_ok;
 
-my $fcfg = $dst->{filter} || '';
-# -mda defaults to the strict base filter
-if ($fcfg eq '') {
-       $dst->{filter} = 'PublicInbox::Filter::Base';
-} elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove?
-       $dst->{filter} = 'PublicInbox::Filter::Mirror';
+# -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';
+       }
 }
+
+mda_filter_adjust($dst);
+
 my $filter = $dst->filter;
 my $ret = $filter->delivery($mime);
 if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message