X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fmda.t;h=3cab590b78f9a9d2728c213706bc229e3ba81aad;hp=755864ca890a9f4540d947a5bca736c9abbe0492;hb=7e881ac8227d1882c92de6f6701ffcba7cef9191;hpb=e6c85810fc1536676fb72b4bf050aca72f0e9b10 diff --git a/t/mda.t b/t/mda.t index 755864ca..3cab590b 100644 --- a/t/mda.t +++ b/t/mda.t @@ -1,15 +1,18 @@ -# Copyright (C) 2014, Eric Wong and all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2014-2019 all contributors +# License: AGPL-3.0+ use strict; use warnings; use Test::More; use Email::MIME; use File::Temp qw/tempdir/; -use Cwd; -use IPC::Run qw(run); +use Cwd qw(getcwd); +use PublicInbox::MID qw(mid2path); +eval { require IPC::Run }; +plan skip_all => "missing IPC::Run for t/mda.t" if $@; my $mda = "blib/script/public-inbox-mda"; -my $tmpdir = tempdir(CLEANUP => 1); +my $learn = "blib/script/public-inbox-learn"; +my $tmpdir = tempdir('pi-mda-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; my $pi_config = "$pi_home/config"; @@ -20,6 +23,8 @@ my $fail_bin = getcwd()."/t/fail-bin"; my $fail_path = "$fail_bin:$ENV{PATH}"; # for spamc spam mock my $addr = 'test-public@example.com'; my $cfgpfx = "publicinbox.test"; +my $faildir = "$home/faildir/"; +my $mime; { ok(-x "$main_bin/spamc", @@ -41,11 +46,36 @@ my $cfgpfx = "publicinbox.test"; } } +local $ENV{GIT_COMMITTER_NAME} = eval { + use PublicInbox::MDA; + use PublicInbox::Address; + use Encode qw/encode/; + my $mbox = 't/utf8.mbox'; + open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n"; + my $str = eval { local $/; <$fh> }; + close $fh; + my $msg = Email::MIME->new($str); + + my $from = $msg->header('From'); + my ($author) = PublicInbox::Address::names($from); + my ($email) = PublicInbox::Address::emails($from); + my $date = $msg->header('Date'); + + is('Eléanor', + encode('us-ascii', my $tmp = $author, Encode::HTMLCREF), + 'HTML conversion is correct'); + is($email, 'e@example.com', 'email parsed correctly'); + is($date, 'Thu, 01 Jan 1970 00:00:00 +0000', + 'message date parsed correctly'); + $author; +}; +die $@ if $@; + { - my $failbox = "$home/fail.mbox"; - local $ENV{PI_FAILBOX} = $failbox; + my $good_rev; + local $ENV{PI_EMERGENCY} = $faildir; local $ENV{HOME} = $home; - local $ENV{RECIPIENT} = $addr; + local $ENV{ORIGINAL_RECIPIENT} = $addr; my $simple = Email::Simple->new(< To: You @@ -60,22 +90,224 @@ EOF # ensure successful message delivery { local $ENV{PATH} = $main_path; - run([$mda], \$in); - local $ENV{GIT_DIR} = $maindir; - my $rev = `git rev-list HEAD`; + IPC::Run::run([$mda], \$in); + my $rev = `git --git-dir=$maindir rev-list HEAD`; like($rev, qr/\A[a-f0-9]{40}/, "good revision committed"); + chomp $rev; + my $cmt = `git --git-dir=$maindir cat-file commit $rev`; + like($cmt, qr/^author Me 0 \+0000\n/m, + "author info set correctly"); + like($cmt, qr/^committer test /m, + "committer info set correctly"); + $good_rev = $rev; } - # ensure failures work + # ensure failures work, fail with bad spamc { - ok(!-e $failbox, "nothing in PI_FAILBOX before"); + my @prev = <$faildir/new/*>; + is(scalar @prev, 0 , "nothing in PI_EMERGENCY before"); local $ENV{PATH} = $fail_path; - run([$mda], \$in); - local $ENV{GIT_DIR} = $maindir; - my @revs = `git rev-list HEAD`; + IPC::Run::run([$mda], \$in); + my @revs = `git --git-dir=$maindir rev-list HEAD`; is(scalar @revs, 1, "bad revision not committed"); - ok(-s $failbox > 0, "PI_FAILBOX is written to"); + my @new = <$faildir/new/*>; + is(scalar @new, 1, "PI_EMERGENCY is written to"); } + + fail_bad_header($good_rev, "bad recipient", <<""); +From: Me +To: You +Message-Id: +Subject: hihi +Date: Thu, 01 Jan 1970 00:00:00 +0000 + + my $fail = fail_bad_header($good_rev, "duplicate Message-ID", <<""); +From: Me +To: You +Cc: $addr +Message-ID: +Subject: hihi +Date: Thu, 01 Jan 1970 00:00:00 +0000 + + like($fail->[2], qr/CONFLICT/, "duplicate Message-ID message"); + + fail_bad_header($good_rev, "missing From:", <<""); +To: $addr +Message-ID: +Subject: hihi +Date: Thu, 01 Jan 1970 00:00:00 +0000 + + fail_bad_header($good_rev, "short subject:", <<""); +To: $addr +From: cat\@example.com +Message-ID: +Subject: a +Date: Thu, 01 Jan 1970 00:00:00 +0000 + + fail_bad_header($good_rev, "no date", <<""); +To: $addr +From: u\@example.com +Message-ID: +Subject: hihi + + fail_bad_header($good_rev, "bad date", <<""); +To: $addr +From: u\@example.com +Message-ID: +Subject: hihi +Date: deadbeef + +} + +# spam training +{ + local $ENV{PI_EMERGENCY} = $faildir; + local $ENV{HOME} = $home; + local $ENV{ORIGINAL_RECIPIENT} = $addr; + local $ENV{PATH} = $main_path; + my $mid = 'spam-train@example.com'; + my $simple = Email::Simple->new(< +To: You +Cc: $addr +Message-ID: <$mid> +Subject: this message will be trained as spam +Date: Thu, 01 Jan 1970 00:00:00 +0000 + +EOF + my $in = $simple->as_string; + + { + # deliver the spam message, first + IPC::Run::run([$mda], \$in); + my $path = mid2path($mid); + my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; + like($msg, qr/\Q$mid\E/, "message delivered"); + + # now train it + local $ENV{GIT_AUTHOR_EMAIL} = 'trainer@example.com'; + local $ENV{GIT_COMMITTER_EMAIL} = 'trainer@example.com'; + local $ENV{GIT_COMMITTER_NAME} = undef; + IPC::Run::run([$learn, "spam"], \$msg); + is($?, 0, "no failure from learning spam"); + IPC::Run::run([$learn, "spam"], \$msg); + is($?, 0, "no failure from learning spam idempotently"); + } +} + +# train ham message +{ + local $ENV{PI_EMERGENCY} = $faildir; + local $ENV{HOME} = $home; + local $ENV{ORIGINAL_RECIPIENT} = $addr; + local $ENV{PATH} = $main_path; + my $mid = 'ham-train@example.com'; + my $simple = Email::Simple->new(< +To: You +Cc: $addr +Message-ID: <$mid> +Subject: this message will be trained as spam +Date: Thu, 01 Jan 1970 00:00:00 +0000 + +EOF + my $in = $simple->as_string; + + # now train it + # these should be overridden + local $ENV{GIT_AUTHOR_EMAIL} = 'trainer@example.com'; + local $ENV{GIT_COMMITTER_EMAIL} = 'trainer@example.com'; + + IPC::Run::run([$learn, "ham"], \$in); + is($?, 0, "learned ham without failure"); + my $path = mid2path($mid); + my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; + like($msg, qr/\Q$mid\E/, "ham message delivered"); + IPC::Run::run([$learn, "ham"], \$in); + is($?, 0, "learned ham idempotently "); + + # ensure trained email is filtered, too + my $html_body = "hi"; + my $parts = [ + Email::MIME->create( + attributes => { + content_type => 'text/html; charset=UTF-8', + encoding => 'base64', + }, + body => $html_body, + ), + Email::MIME->create( + attributes => { + content_type => 'text/plain', + encoding => 'quoted-printable', + }, + body => 'hi = "bye"', + ) + ]; + $mid = 'multipart-html-sucks@11'; + $mime = Email::MIME->create( + header_str => [ + From => 'a@example.com', + Subject => 'blah', + Cc => $addr, + 'Message-ID' => "<$mid>", + 'Content-Type' => 'multipart/alternative', + ], + parts => $parts, + ); + + { + $in = $mime->as_string; + IPC::Run::run([$learn, "ham"], \$in); + is($?, 0, "learned ham without failure"); + my $path = mid2path($mid); + $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; + like($msg, qr/<\Q$mid\E>/, "ham message delivered"); + unlike($msg, qr//i, ' filtered'); + } +} + +# List-ID based delivery +{ + local $ENV{PI_EMERGENCY} = $faildir; + local $ENV{HOME} = $home; + local $ENV{ORIGINAL_RECIPIENT} = undef; + local $ENV{PATH} = $main_path; + my $list_id = 'foo.example.com'; + my $mid = 'list-id-delivery@example.com'; + my $simple = Email::Simple->new(< +To: You +Cc: $addr +Message-ID: <$mid> +List-Id: <$list_id> +Subject: this message will be trained as spam +Date: Thu, 01 Jan 1970 00:00:00 +0000 + +EOF + system(qw(git config --file), $pi_config, "$cfgpfx.listid", $list_id); + $? == 0 or die "failed to set listid $?"; + my $in = $simple->as_string; + IPC::Run::run([$mda], \$in); + is($?, 0, 'mda OK with List-Id match'); + my $path = mid2path($mid); + my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; + like($msg, qr/\Q$list_id\E/, 'delivered message w/ List-ID matches'); } done_testing(); + +sub fail_bad_header { + my ($good_rev, $msg, $in) = @_; + my @f = glob("$faildir/*/*"); + unlink @f if @f; + my ($out, $err) = ("", ""); + local $ENV{PATH} = $main_path; + IPC::Run::run([$mda], \$in, \$out, \$err); + my $rev = `git --git-dir=$maindir rev-list HEAD`; + chomp $rev; + is($rev, $good_rev, "bad revision not commited ($msg)"); + @f = glob("$faildir/*/*"); + is(scalar @f, 1, "faildir written to"); + [ $in, $out, $err ]; +}