X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-mda;h=6935461662e6e900adddfa569d427272df097a24;hb=1d9317540bc3fea86dcd512bb54275324ed1b0fa;hp=2655a6c5ed064aad67b97f0c575a3212cde68344;hpb=7e881ac8227d1882c92de6f6701ffcba7cef9191;p=public-inbox.git

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 2655a6c5..69354616 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -5,7 +5,8 @@
 # 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 $usage = 'public-inbox-mda [OPTIONS] < rfc2822_message';
+my $precheck = grep(/\A--no-precheck\z/, @ARGV) ? 0 : 1;
 my ($ems, $emm);
 
 sub do_exit {
@@ -42,20 +43,19 @@ 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->{mainrepo} or do_exit(67);
+$dst->{inboxdir} or do_exit(67);
 $dst = PublicInbox::InboxWritable->new($dst);
 
 # pre-check, MDA has stricter rules than an importer might;
-do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address});
+if ($precheck && !PublicInbox::MDA->precheck($simple, $dst->{address})) {
+	do_exit(0);
+}
 $simple = undef;
 my $spam_ok;
 if ($spamc) {
@@ -71,17 +71,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