X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmda.t;h=a8e78b38e6a6311edfd934e7dc587649b459d2f8;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=b403c6b37998ffa56c40fdb3621a1a66c5bdf704;hpb=8add30044d04c1feccc00a3c5b8f9a0f75c64bf5;p=public-inbox.git diff --git a/t/mda.t b/t/mda.t index b403c6b3..a8e78b38 100644 --- a/t/mda.t +++ b/t/mda.t @@ -1,9 +1,10 @@ -# Copyright (C) 2014, Eric Wong and all contributors +# Copyright (C) 2014-2015 all contributors # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) use strict; use warnings; use Test::More; use Email::MIME; +use Email::Filter; use File::Temp qw/tempdir/; use Cwd; use IPC::Run qw(run); @@ -22,6 +23,7 @@ my $fail_path = "$fail_bin:$ENV{PATH}"; # for spamc spam mock my $addr = 'test-public@example.com'; my $cfgpfx = "publicinbox.test"; my $failbox = "$home/fail.mbox"; +my $mime; { ok(-x "$main_bin/spamc", @@ -43,11 +45,31 @@ my $failbox = "$home/fail.mbox"; } } +local $ENV{GIT_COMMITTER_NAME} = eval { + use PublicInbox::MDA; + 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::Filter->new(data => $str); + $msg = Email::MIME->new($msg->simple->as_string); + my ($author, $email, $date) = PublicInbox::MDA->author_info($msg); + 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 $good_rev; - local $ENV{PI_FAILBOX} = $failbox; + local $ENV{PI_EMERGENCY} = $failbox; local $ENV{HOME} = $home; - local $ENV{RECIPIENT} = $addr; + local $ENV{ORIGINAL_RECIPIENT} = $addr; my $simple = Email::Simple->new(< To: You @@ -77,13 +99,13 @@ EOF # ensure failures work, fail with bad spamc { - ok(!-e $failbox, "nothing in PI_FAILBOX before"); + ok(!-e $failbox, "nothing in PI_EMERGENCY before"); local $ENV{PATH} = $fail_path; run([$mda], \$in); local $ENV{GIT_DIR} = $maindir; my @revs = `git rev-list HEAD`; is(scalar @revs, 1, "bad revision not committed"); - ok(-s $failbox > 0, "PI_FAILBOX is written to"); + ok(-s $failbox > 0, "PI_EMERGENCY is written to"); } fail_bad_header($good_rev, "bad recipient", <<""); @@ -133,9 +155,9 @@ Date: deadbeef # spam training { - local $ENV{PI_FAILBOX} = $failbox; + local $ENV{PI_EMERGENCY} = $failbox; local $ENV{HOME} = $home; - local $ENV{RECIPIENT} = $addr; + local $ENV{ORIGINAL_RECIPIENT} = $addr; local $ENV{PATH} = $main_path; my $mid = 'spam-train@example.com'; my $simple = Email::Simple->new(<new(<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'; + run([$learn, "ham"], \$in); is($?, 0, "learned ham without failure"); my $msg = `ssoma cat $mid $maindir`; like($msg, qr/\Q$mid\E/, "ham message delivered"); 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; + run([$learn, "ham"], \$in); + is($?, 0, "learned ham without failure"); + $msg = `ssoma cat $mid $maindir`; + like($msg, qr/<\Q$mid\E>/, "ham message delivered"); + unlike($msg, qr//i, ' filtered'); + } +} + +# faildir - emergency destination is maildir +{ + my $faildir= "$home/faildir/"; + local $ENV{PI_EMERGENCY} = $faildir; + local $ENV{HOME} = $home; + local $ENV{ORIGINAL_RECIPIENT} = $addr; + local $ENV{PATH} = $fail_path; + my $in = < +To: You +Cc: $addr +Message-ID: +Subject: faildir subject +Date: Thu, 01 Jan 1970 00:00:00 +0000 + +EOF + run([$mda], \$in); + ok(-d $faildir, "emergency exists"); + my @new = glob("$faildir/new/*"); + is(scalar(@new), 1, "message delivered"); + is(unlink(@new), 1, "removed emergency message"); + + local $ENV{PATH} = $main_path; + $in = < +To: $addr +Content-Type: text/html +Message-ID: +Subject: faildir subject +Date: Thu, 01 Jan 1970 00:00:00 +0000 + +bad +EOF + my $out = ''; + my $err = ''; + run([$mda], \$in, \$out, \$err); + isnt($?, 0, "mda exited with failure"); + is(length $out, 0, 'nothing in stdout'); + isnt(length $err, 0, 'error message in stderr'); + + @new = glob("$faildir/new/*"); + is(scalar(@new), 0, "new message did not show up"); + + # reject multipart again + $in = $mime->as_string; + $err = ''; + run([$mda], \$in, \$out, \$err); + isnt($?, 0, "mda exited with failure"); + is(length $out, 0, 'nothing in stdout'); + isnt(length $err, 0, 'error message in stderr'); + @new = glob("$faildir/new/*"); + is(scalar(@new), 0, "new message did not show up"); } done_testing(); @@ -207,6 +324,6 @@ sub fail_bad_header { my $rev = `git rev-list HEAD`; chomp $rev; is($rev, $good_rev, "bad revision not commited ($msg)"); - ok(-s $failbox > 0, "PI_FAILBOX is written to ($msg)"); + ok(-s $failbox > 0, "PI_EMERGENCY is written to ($msg)"); [ $in, $out, $err ]; }