X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox-mda;h=1a9469badfecd1c179601d5d7f7cba48b718ccc6;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=8f63fa7ecba133621dd807955a71947aa66262ba;hpb=71abf270f5b11f147be839a9b057e106d0f8509f;p=public-inbox.git

diff --git a/public-inbox-mda b/public-inbox-mda
index 8f63fa7e..1a9469ba 100755
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -1,72 +1,94 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
 my $usage = 'public-inbox-mda < rfc2822_message';
 
 use Email::Filter;
+use Email::MIME;
 use Email::Address;
 use File::Path::Expand qw/expand_filename/;
 use IPC::Run qw(run);
-use constant MDA => 'ssoma-mda';
-use PublicInbox;
+use PublicInbox::MDA;
 use PublicInbox::Filter;
 use PublicInbox::Config;
 
-# n.b: hopefully we can setup the failbox path without bailing due to
+# 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 $failbox = $ENV{PI_FAILBOX} || '~/public-inbox-fail.mbox';
-$failbox = expand_filename($failbox);
+my $emergency = $ENV{PI_EMERGENCY} || '~/.public-inbox/emergency/';
+$emergency = expand_filename($emergency);
 
 # this reads the message from stdin
-my $filter = Email::Filter->new(emergency => $failbox);
+my $filter = Email::Filter->new(emergency => $emergency);
 my $config = PublicInbox::Config->new;
 
-my $recipient = $ENV{RECIPIENT};
-defined $recipient or die "RECIPIENT not defined in ENV\n";
-my $dst = $config->lookup($recipient);
+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 $fail_repo = $dst->{failrepo} or exit(1);
 my $filtered; # string dest
 
-if (PublicInbox->precheck($filter, $recipient) &&
+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 $simple = Email::Simple->new($filtered);
+	my $msg = Email::MIME->new(\$filtered);
 	$filtered = undef;
-	$filter->simple($simple);
+	$filter->simple($msg);
 
-	if (PublicInbox::Filter->run($simple)) {
+	if (PublicInbox::Filter->run($msg, $filter)) {
 		# run spamc again on the HTML-free message
-		if (do_spamc($simple, \$filtered)) {
-			$filter->simple(Email::Simple->new($filtered));
-			$filter->pipe(MDA, $main_repo);
-		} else {
-			$filter->pipe(MDA, $fail_repo);
+		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 {
+				search_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);
 		}
-	} else {
-		# PublicInbox::Filter nuked everything, oops :x
-		$filter->pipe(MDA, $fail_repo);
 	}
 } else {
-	# if SA thinks it's spam or there's an error:
-	# don't bother with our own filtering
-	$filter->pipe(MDA, $fail_repo);
+	# 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);
+	}
 }
-die "Email::Filter failed to exit\n";
+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 ($simple, $out) = @_;
+	my ($msg, $out) = @_;
 	eval {
-		my $orig = $simple->as_string;
+		my $orig = $msg->as_string;
 		run([qw/spamc -E --headers/], \$orig, $out);
 	};
 
-	return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
+	return ($@ || $? || !defined($$out) || $$out eq '') ? 0 : 1;
+}
+
+sub search_index_sync {
+	my ($git_dir) = @_;
+	eval {
+		require PublicInbox::SearchIdx;
+		PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;
+	};
 }