X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimapd.t;h=43de867548c651ab89bb98bc51d8211e768cee28;hb=HEAD;hp=cf327e9fbeab42d4917800ee72f2e51403e46459;hpb=b82d2eed5248d7e80cae5bfdf418a563ebfba3af;p=public-inbox.git diff --git a/t/imapd.t b/t/imapd.t index cf327e9f..c7dc01a5 100644 --- a/t/imapd.t +++ b/t/imapd.t @@ -1,15 +1,13 @@ #!perl -w -# Copyright (C) 2020 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # end-to-end IMAP tests, see unit tests in t/imap.t, too use strict; -use Test::More; +use v5.10.1; use Time::HiRes (); use PublicInbox::TestCommon; use PublicInbox::Config; -use PublicInbox::Spawn qw(which); -require_mods(qw(DBD::SQLite Mail::IMAPClient Mail::IMAPClient::BodyStructure - Email::Address::XS||Mail::Address Parse::RecDescent)); +require_mods(qw(-imapd Mail::IMAPClient)); my $imap_client = 'Mail::IMAPClient'; my $can_compress = $imap_client->can('compress'); if ($can_compress) { # hope this gets fixed upstream, soon @@ -31,42 +29,41 @@ push(@V, 2) if require_git('2.6', 1); my ($tmpdir, $for_destroy) = tmpdir(); my $home = "$tmpdir/home"; -local $ENV{HOME} = $home; - +BAIL_OUT "mkdir: $!" unless (mkdir($home) and mkdir("$home/.public-inbox")); +my @ibx; +open my $cfgfh, '>', "$home/.public-inbox/config" or BAIL_OUT; +print $cfgfh < $addr }; - run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or - BAIL_OUT('-mda delivery'); - if ($V == 1) { - run_script(['-index', $inboxdir]) or BAIL_OUT("index $?"); - } + my $ibx = create_inbox("i$V-$level", + tmpdir => "$tmpdir/i$V", version => $V, + indexlevel => $level, sub { + my ($im) = @_; + $im->add($eml //= eml_load('t/utf8.eml')) or BAIL_OUT; + }); + push @ibx, $ibx; + $ibx->{newsgroup} = "inbox.i$V"; + print $cfgfh <{inboxdir} + address = $ibx->{-primary_address}; + newsgroup = inbox.i$V + url = http://example.com/i$V + indexlevel = $level +EOF } +close $cfgfh or BAIL_OUT; +local $ENV{HOME} = $home; my $sock = tcp_server(); my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; my $cmd = [ '-imapd', '-W0', "--stdout=$out", "--stderr=$err" ]; my $td = start_script($cmd, undef, { 3 => $sock }) or BAIL_OUT("-imapd: $?"); -my %mic_opt = ( - Server => $sock->sockhost, - Port => $sock->sockport, - Uid => 1, -); +my ($ihost, $iport) = tcp_host_port($sock); +my %mic_opt = ( Server => $ihost, Port => $iport, Uid => 1 ); my $mic = $imap_client->new(%mic_opt); my $pre_login_capa = $mic->capability; is(grep(/\AAUTH=ANONYMOUS\z/, @$pre_login_capa), 1, @@ -87,18 +84,23 @@ my $post_auth_anon_capa = $mic->capability; is_deeply($post_auth_anon_capa, $post_login_capa, 'auth anon has same capabilities'); my $e; +ok($mic->noop, 'NOOP'); +ok($mic->noop, 'NOOP (again)'); # for warnings ok(!$mic->examine('foo') && ($e = $@), 'EXAMINE non-existent'); like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent'); ok(!$mic->select('foo') && ($e = $@), 'EXAMINE non-existent'); like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent'); my $mailbox1 = "inbox.i1.$first_range"; ok($mic->select('inbox.i1'), 'SELECT on parent succeeds'); +ok($mic->noop, 'NOOP while selected'); +ok($mic->noop, 'NOOP again while selected'); # check warnings later ok($mic->select($mailbox1), 'SELECT succeeds'); ok($mic->examine($mailbox1), 'EXAMINE succeeds'); my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity)); is(scalar(@raw), 2, 'got status response'); like($raw[0], qr/\A\*\x20STATUS\x20inbox\.i1\.$first_range\x20 - \(MESSAGES\x20\d+\x20UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx); + \(MESSAGES\x20[1-9][0-9]*\x20 + UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx); like($raw[1], qr/\A\S+ OK /, 'finished status response'); my @orig_list = @raw = $mic->list; @@ -120,9 +122,11 @@ $ret = $mic->search('uid 1:1') or BAIL_OUT "SEARCH FAIL $@"; is_deeply($ret, [ 1 ], 'search UID 1:1 works'); $ret = $mic->search('uid 1:*') or BAIL_OUT "SEARCH FAIL $@"; is_deeply($ret, [ 1 ], 'search UID 1:* works'); +$ret = $mic->search('DELETED') or BAIL_OUT "SEARCH FAIL $@"; +is_deeply($ret, [], 'searching for DELETED returns nothing'); SKIP: { - skip 'Xapian missing', 7 if $level eq 'basic'; + skip 'Xapian missing', 8 if $level eq 'basic'; my $x = $mic->search(qw(smaller 99999)); is_deeply($x, [1], 'SMALLER works with Xapian (hit)'); $x = $mic->search(qw(smaller 9)); @@ -135,6 +139,10 @@ SKIP: { $x = $mic->search(qw(HEADER Message-ID testmessage@example.com)); is_deeply($x, [1], 'HEADER Message-ID works'); + + $x = $mic->search(qw(DRAFT HEADER Message-ID testmessage@example.com)); + is_deeply($x, [], 'impossible (DRAFT) key filters out match'); + $x = $mic->search(qw(HEADER Message-ID miss)); is_deeply($x, [], 'HEADER Message-ID can miss'); @@ -243,10 +251,7 @@ ok($mic->logout, 'logout works'); my $have_inotify = eval { require Linux::Inotify2; 1 }; -my $pi_config = PublicInbox::Config->new; -$pi_config->each_inbox(sub { - my ($ibx) = @_; - my $env = { ORIGINAL_RECIPIENT => $ibx->{-primary_address} }; +for my $ibx (@ibx) { my $name = $ibx->{name}; my $ng = $ibx->{newsgroup}; my $mic = $imap_client->new(%mic_opt); @@ -258,10 +263,9 @@ $pi_config->each_inbox(sub { ok(!$mic->idle, "IDLE fails w/o SELECT/EXAMINE $name"); ok($mic->examine($mb), "EXAMINE $ng succeeds"); ok(my $idle_tag = $mic->idle, "IDLE succeeds on $ng"); - - open(my $fh, '<', 't/data/message_embed.eml') or BAIL_OUT("open: $!"); - run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or - BAIL_OUT('-mda delivery'); + my $im = $ibx->importer(0); + $im->add(eml_load 't/data/message_embed.eml') or BAIL_OUT; + $im->done; my $t0 = Time::HiRes::time(); ok(my @res = $mic->idle_data(11), "IDLE succeeds on $ng"); is(grep(/\A\* [0-9] EXISTS\b/, @res), 1, 'got EXISTS message'); @@ -288,31 +292,14 @@ $pi_config->each_inbox(sub { # ensure IDLE persists across HUP, w/o extra watches or FDs $td->kill('HUP') or BAIL_OUT "failed to kill -imapd: $!"; - SKIP: { - skip 'no inotify fdinfo (or support)', 2 if !@ino_info; - my (@tmp, %prev); - local $/ = "\n"; - my $end = time + 5; - until (time > $end) { - select undef, undef, undef, 0.01; - open my $fh, '<', $ino_fdinfo or - BAIL_OUT "$ino_fdinfo: $!"; - %prev = map { $_ => 1 } @ino_info; - @tmp = grep(/^inotify wd:/, <$fh>); - if (scalar(@tmp) == scalar(@ino_info)) { - delete @prev{@tmp}; - last if scalar(keys(%prev)) == @ino_info; - } - } - is(scalar @tmp, scalar @ino_info, - 'old inotify watches replaced'); - is(scalar keys %prev, scalar @ino_info, - 'no previous watches overlap'); - }; + for my $n (1..2) { # kick the event loop so we know HUP is done + my $m = $imap_client->new(%mic_opt); + ok($m->login && $m->IsAuthenticated && $m->logout, + "connection $n works after HUP"); + } - open($fh, '<', 't/data/0001.patch') or BAIL_OUT("open: $!"); - run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or - BAIL_OUT('-mda delivery'); + $im->add(eml_load 't/data/0001.patch') or BAIL_OUT; + $im->done; $t0 = Time::HiRes::time(); ok(@res = $mic->idle_data(11), "IDLE succeeds on $ng after HUP"); is(grep(/\A\* [0-9] EXISTS\b/, @res), 1, 'got EXISTS message'); @@ -363,7 +350,11 @@ EOF @hits = $mic->search('SENTSINCE' => '18-Apr-2020'); is_deeply(\@hits, [], 'search on dummy with condition works'); ok(!$mic->search('SENTSINCE' => '18-Abr-2020'), 'bad month fails'); -}); # each_inbox + $mic->Uid(0); + my $ret = $mic->fetch_hash(2, 'RFC822'); + is_deeply($ret, {}, + 'MSN FETCH on empty dummy will not trigger warnings, later'); +}; # for @ibx # message sequence numbers :< is($mic->Uid(0), 0, 'disable UID on '.ref($mic)); @@ -375,11 +366,13 @@ is(scalar keys %$ret, 3, 'got all 3 messages'); SKIP: { # do any clients use non-UID IMAP SEARCH? - skip 'Xapian missing', 2 if $level eq 'basic'; + skip 'Xapian missing', 3 if $level eq 'basic'; my $x = $mic->search('all'); is_deeply($x, [1, 2, 3], 'MSN SEARCH works before rm'); $x = $mic->search(qw(header subject embedded)); is_deeply($x, [2], 'MSN SEARCH on Subject works before rm'); + $x = $mic->search('FROM scraper@example.com'); + is_deeply($x, [], "MSN SEARCH miss won't trigger warnings"); } { @@ -396,8 +389,11 @@ SKIP: { skip 'Xapian missing', 3 if $level eq 'basic'; my $x = $mic->search(qw(header subject embedded)); is(scalar(@$x), 1, 'MSN SEARCH on Subject works after rm'); - $x = $mic->message_string($x->[0]); - is($x, $ret->{2}->{RFC822}, 'message 2 unchanged'); + SKIP: { + skip 'previous test failed', 1 if !scalar(@$x); + $x = $mic->message_string($x->[0]); + is($x, $ret->{2}->{RFC822}, 'message 2 unchanged'); + } $x = $mic->search(qw(text embedded)); is(scalar(@$x), 1, 'MSN SEARCH on TEXT works after rm'); } @@ -441,21 +437,18 @@ ok($mic->logout, 'logged out'); } SKIP: { - use_ok 'PublicInbox::WatchMaildir'; use_ok 'PublicInbox::InboxIdle'; - require_git('1.8.5', 1) or - skip('git 1.8.5+ needed for --urlmatch', 4); + require_git '1.8.5', 4; my $old_env = { HOME => $ENV{HOME} }; my $home = "$tmpdir/watch_home"; mkdir $home or BAIL_OUT $!; mkdir "$home/.public-inbox" or BAIL_OUT $!; local $ENV{HOME} = $home; my $name = 'watchimap'; - my $addr = "i1\@example.com"; + my $addr = "i1-$level\@example.com"; my $url = "http://example.com/i1"; my $inboxdir = "$tmpdir/watchimap"; my $cmd = ['-init', '-V2', '-Lbasic', $name, $inboxdir, $url, $addr]; - my ($ihost, $iport) = ($sock->sockhost, $sock->sockport); my $imapurl = "imap://$ihost:$iport/inbox.i1.0"; run_script($cmd) or BAIL_OUT("init $name"); xsys(qw(git config), "--file=$home/.public-inbox/config", @@ -468,22 +461,23 @@ SKIP: { my $obj = bless \$cb, 'PublicInbox::TestCommon::InboxWakeup'; $cfg->each_inbox(sub { $_[0]->subscribe_unlock('ident', $obj) }); my $watcherr = "$tmpdir/watcherr"; - open my $err_wr, '>', $watcherr or BAIL_OUT $!; + open my $err_wr, '>>', $watcherr or BAIL_OUT $!; open my $err, '<', $watcherr or BAIL_OUT $!; my $w = start_script(['-watch'], undef, { 2 => $err_wr }); diag 'waiting for initial fetch...'; - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); diag 'inbox unlocked on initial fetch, waiting for IDLE'; - tick until (grep(/I: \S+ idling/, <$err>)); + tick until (grep(/# \S+ idling/, <$err>)); open my $fh, '<', 't/iso-2202-jp.eml' or BAIL_OUT $!; $old_env->{ORIGINAL_RECIPIENT} = $addr; ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }), - 'delivered a message for IDLE to kick -watch'); + 'delivered a message for IDLE to kick -watch') or + diag "mda error \$?=$?"; diag 'waiting for IMAP IDLE wakeup'; PublicInbox::DS->SetPostLoopCallback(undef); - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); diag 'inbox unlocked on IDLE wakeup'; # try again with polling @@ -492,7 +486,7 @@ SKIP: { or BAIL_OUT "git config $?"; $w->kill('HUP'); diag 'waiting for -watch reload + initial fetch'; - tick until (grep(/I: will check/, <$err>)); + tick until (grep(/# will check/, <$err>)); open $fh, '<', 't/psgi_attach.eml' or BAIL_OUT $!; ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }), @@ -500,7 +494,7 @@ SKIP: { diag 'waiting for PollInterval wakeup'; PublicInbox::DS->SetPostLoopCallback(undef); - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); diag 'inbox unlocked (poll)'; $w->kill; $w->join; @@ -510,13 +504,66 @@ SKIP: { $ii->close; PublicInbox::DS->Reset; seek($err, 0, 0); - my @err = grep(!/^I:/, <$err>); + my @err = grep(!/^(?:I:|#)/, <$err>); is(@err, 0, 'no warnings/errors from -watch'.join(' ', @err)); + + if ($ENV{TEST_KILL_IMAPD}) { # not sure how reliable this test can be + xsys(qw(git config), "--file=$home/.public-inbox/config", + qw(--unset imap.PollInterval)) == 0 + or BAIL_OUT "git config $?"; + truncate($err_wr, 0) or BAIL_OUT $!; + my @t0 = times; + $w = start_script(['-watch'], undef, { 2 => $err_wr }); + seek($err, 0, 0); + tick until (grep(/# \S+ idling/, <$err>)); + diag 'killing imapd, waiting for CPU spins'; + my $delay = 0.11; + $td->kill(9); + tick $delay; + $w->kill; + $w->join; + is($?, 0, 'no error in exited -watch process'); + my @t1 = times; + my $c = $t1[2] + $t1[3] - $t0[2] - $t0[3]; + my $thresh = (0.9 * $delay); + diag "c=$c, threshold=$thresh"; + ok($c < $thresh, 'did not burn much CPU'); + is_deeply([grep(/ line \d+$/m, <$err>)], [], + 'no backtraces from errors'); + } +} + +{ + ok(my $ic = $imap_client->new(%mic_opt), 'logged in'); + my $mb = "$ibx[0]->{newsgroup}.$first_range"; + ok($ic->examine($mb), "EXAMINE $mb"); + my $uidnext = $ic->uidnext($mb); # we'll fetch BODYSTRUCTURE on this + my $im = $ibx[0]->importer(0); + $im->add(PublicInbox::Eml->new(< +From: Ævar Arnfjörð Bjarmason +To: git\@vger.kernel.org + +EOF + $im->done; + my $envl = $ic->get_envelope($uidnext); + is($envl->{subject}, 'test Ævar', 'UTF-8 subject'); + is($envl->{sender}->[0]->{personalname}, 'Ævar Arnfjörð Bjarmason', + 'UTF-8 sender[0].personalname'); + SKIP: { + skip 'need compress for comparisons', 1 if !$can_compress; + ok($ic = $imap_client->new(%mic_opt), 'uncompressed logged in'); + ok($ic && $ic->compress, 'compress enabled'); + ok($ic->examine($mb), "EXAMINE $mb"); + my $raw = $ic->get_envelope($uidnext); + is_deeply($envl, $raw, 'raw and compressed match'); + } } $td->kill; $td->join; -is($?, 0, 'no error in exited process'); +is($?, 0, 'no error in exited process') if !$ENV{TEST_KILL_IMAPD}; open my $fh, '<', $err or BAIL_OUT("open $err failed: $!"); my $eout = do { local $/; <$fh> }; unlike($eout, qr/wide/i, 'no Wide character warnings');