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 $recipient = $ENV{ORIGINAL_RECIPIENT};
+defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n";
my $dst = $config->lookup($recipient);
defined $dst or exit(1);
my $main_repo = $dst->{mainrepo} or exit(1);
my $filtered; # string dest
-if (PublicInbox->precheck($filter, $recipient) &&
+if (PublicInbox::MDA->precheck($filter, $recipient) &&
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::Simple->new($filtered);
$filtered = undef;
- $filter->simple($simple);
+ $filter->simple($msg);
- if (PublicInbox::Filter->run($simple)) {
+ if (PublicInbox::Filter->run($msg)) {
# run spamc again on the HTML-free message
- if (do_spamc($simple, \$filtered)) {
- $simple = Email::Simple->new($filtered);
- $filter->simple($simple);
+ if (do_spamc($msg, \$filtered)) {
+ $msg = Email::MIME->new($filtered);
+ PublicInbox::MDA->set_list_headers($msg, $dst);
+ $filter->simple($msg);
- my $from = $filter->from;
- my @from = Email::Address->parse($from);
- my $name = $from[0]->name;
- defined $name or $name = "";
- my $email = $from[0]->address;
- defined $email or $email = "";
+ my ($name, $email, $date) =
+ PublicInbox::MDA->author_info($msg);
local $ENV{GIT_AUTHOR_NAME} = $name;
local $ENV{GIT_AUTHOR_EMAIL} = $email;
- local $ENV{GIT_AUTHOR_DATE} = $simple->header("Date");
+ local $ENV{GIT_AUTHOR_DATE} = $date;
local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
- $filter->pipe(MDA, '-1', $main_repo);
+ $filter->pipe(PublicInbox::MDA->cmd, $main_repo);
}
}
}
-exit 0; # goes to failbox
+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);
};