X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmda.t;h=6b7527d4ed71a8b3760e269d3d69d8df20cbbec6;hb=fe3d2447badd595df784541556311137b920b0a2;hp=d70288bc785d419039cb0f367f65e071e4e247b1;hpb=6dfb9311700d09fb019bee74d2b420c6cdea8b8f;p=public-inbox.git diff --git a/t/mda.t b/t/mda.t index d70288bc..6b7527d4 100644 --- a/t/mda.t +++ b/t/mda.t @@ -1,16 +1,18 @@ -# 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); +use PublicInbox::MID qw(mid2path); my $mda = "blib/script/public-inbox-mda"; my $learn = "blib/script/public-inbox-learn"; -my $tmpdir = tempdir(CLEANUP => 1); +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"; @@ -22,6 +24,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 +46,37 @@ 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 $from = $msg->header('From'); + my @from = Email::Address->parse($from); + my $author = $from[0]->name; + my $email = $from[0]->address; + 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 $good_rev; 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 @@ -135,7 +164,7 @@ Date: deadbeef { 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`; + my $path = mid2path($mid); + my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; 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"); + 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'); + } } # faildir - emergency destination is maildir @@ -199,7 +272,7 @@ EOF my $faildir= "$home/faildir/"; local $ENV{PI_EMERGENCY} = $faildir; local $ENV{HOME} = $home; - local $ENV{RECIPIENT} = $addr; + local $ENV{ORIGINAL_RECIPIENT} = $addr; local $ENV{PATH} = $fail_path; my $in = < @@ -214,6 +287,38 @@ EOF 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();