X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fnntpd.t;h=34e9e1b45462675d175f807fc6a1bdc38477334f;hp=c681b01c3d9d4eb40036ae9f8e98543c2f1bd07b;hb=1c3e60b66e01df89afdf74990a849a5a7386f9c7;hpb=0e6ceff37fc38f28a1520d7475f31d47f74ec7e6 diff --git a/t/nntpd.t b/t/nntpd.t index c681b01c..34e9e1b4 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -1,24 +1,20 @@ -# Copyright (C) 2015-2020 all contributors +#!perl -w +# Copyright (C) all contributors # License: AGPL-3.0+ -use strict; -use warnings; -use Test::More; -use PublicInbox::TestCommon; -use PublicInbox::Spawn qw(which); +use strict; use v5.10.1; use PublicInbox::TestCommon; require_mods(qw(DBD::SQLite)); -require PublicInbox::InboxWritable; use PublicInbox::Eml; -use IO::Socket; use Socket qw(IPPROTO_TCP TCP_NODELAY); use Net::NNTP; use Sys::Hostname; use POSIX qw(_exit); use Digest::SHA; -# FIXME: make easier to test both versions +# t/nntpd-v2.t wraps this for v2 my $version = $ENV{PI_TEST_VERSION} || 1; require_git('2.6') if $version == 2; -my $lsof = which('lsof'); +use_ok 'PublicInbox::Msgmap'; +my $lsof = require_cmd('lsof', 1); my $fast_idle = eval { require Linux::Inotify2; 1 } // eval { require IO::KQueue; 1 }; @@ -26,43 +22,14 @@ my ($tmpdir, $for_destroy) = tmpdir(); my $home = "$tmpdir/pi-home"; my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; -my $inboxdir = "$tmpdir/main.git"; +my $inboxdir = "$tmpdir/inbox"; my $group = 'test-nntpd'; my $addr = $group . '@example.com'; -SKIP: { - skip "git 2.6+ required for V2Writable", 1 if $version == 1; - use_ok 'PublicInbox::V2Writable'; -} - -my %opts; my $sock = tcp_server(); +my $host_port = tcp_host_port($sock); my $td; -my $len; - -my $ibx = { - inboxdir => $inboxdir, - name => $group, - version => $version, - -primary_address => $addr, - indexlevel => 'basic', -}; -$ibx = PublicInbox::Inbox->new($ibx); -{ - local $ENV{HOME} = $home; - my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr); - push @cmd, "-V$version", '-Lbasic'; - ok(run_script(\@cmd), 'init OK'); - is(xsys(qw(git config), "--file=$home/.public-inbox/config", - "publicinbox.$group.newsgroup", $group), - 0, 'enabled newsgroup'); - my $len; - - $ibx = PublicInbox::InboxWritable->new($ibx); - my $im = $ibx->importer(0); - # ensure successful message delivery - { - my $mime = PublicInbox::Eml->new(<new(< From: =?utf-8?Q?El=C3=A9anor?= Cc: $addr @@ -75,27 +42,54 @@ References: This is a test message for El\xc3\xa9anor EOF - my $list_id = $addr; - $list_id =~ s/@/./; - $mime->header_set('List-Id', "<$list_id>"); - my $str = $mime->as_string; - $str =~ s/(?add($mime); - $im->done; - if ($version == 1) { - ok(run_script(['-index', $ibx->{inboxdir}]), - 'indexed v1'); - } - } +my $list_id = $addr; +$list_id =~ s/@/./; +$eml->header_set('List-Id', "<$list_id>"); +my $str = $eml->as_string; +$str =~ s/(? $version, indexlevel => 'basic', + tmpdir => $inboxdir, sub { + my ($im, $ibx) = @_; + $im->add($eml) or BAIL_OUT; +}; +undef $eml; +my $other = create_inbox "other$version", version => $version, + indexlevel => 'basic', sub { + my ($im) = @_; + $im->add(eml_load 't/utf8.eml') or BAIL_OUT; +}; + +local $ENV{HOME} = $home; +mkdir $home or BAIL_OUT $!; +mkdir "$home/.public-inbox" or BAIL_OUT $!; +open my $cfgfh, '>', "$home/.public-inbox/config" or BAIL_OUT $!; +print $cfgfh <{inboxdir} + url = http://example.com/xyz + address = e\@example.com + indexlevel = basic + newsgroup = x.y.z +[publicinboxMda] + spamcheck = none +EOF +close $cfgfh or BAIL_OUT; - ok($sock, 'sock created'); +{ my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ]; $td = start_script($cmd, undef, { 3 => $sock }); - my $host_port = $sock->sockhost . ':' . $sock->sockport; my $n = Net::NNTP->new($host_port); my $list = $n->list; + ok(delete $list->{'x.y.z'}, 'deleted x.y.z group'); is_deeply($list, { $group => [ qw(1 1 n) ] }, 'LIST works'); is_deeply([$n->group($group)], [ qw(0 1 1), $group ], 'GROUP works'); is_deeply($n->listgroup($group), [1], 'listgroup OK'); @@ -111,11 +105,6 @@ EOF $n->can('starttls') or skip('Net::NNTP too old to support STARTTLS', 2); require_mods('IO::Socket::SSL', 2); - eval { - IO::Socket::SSL->VERSION(2.007); - } or skip(<starttls, 'STARTTLS fails when unconfigured'); is($n->code, 580, 'got 580 code on server w/o TLS'); }; @@ -210,6 +199,7 @@ EOF is_deeply($n->head(1), $n->head(''), 'HEAD OK'); is_deeply($n->body(1), $n->body(''), 'BODY OK'); + is_deeply($n->nntpstat(1), '', 'STAT'); is($n->body(1)->[0], "This is a test message for El\xc3\xa9anor\n", 'body really matches'); my $art = $n->article(1); @@ -239,7 +229,7 @@ EOF is_deeply($n->xhdr(qw(list-id 1-)), {}, 'XHDR on invalid header returns empty'); - my $mids = $n->newnews(0, '*'); + my $mids = $n->newnews(0, $group); is_deeply($mids, [''], 'NEWNEWS works'); { my $t0 = time; @@ -257,12 +247,9 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 my $long_hdr = 'for-leafnode-'.('y'x200).'@example.com'; $for_leafnode->header_set('Message-ID', "<$long_hdr>"); + my $im = $ibx->importer(0); $im->add($for_leafnode); $im->done; - if ($version == 1) { - ok(run_script(['-index', $ibx->{inboxdir}]), - 'indexed v1'); - } my $hdr = $n->head("<$long_hdr>"); my $expect = qr/\AMessage-ID: /i . qr/\Q<$long_hdr>\E/; ok(scalar(grep(/$expect/, @$hdr)), 'Message-ID not folded'); @@ -286,6 +273,15 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 } } + ok($n->article(''), + 'cross newsgroup ARTICLE by Message-ID'); + ok($n->body(''), + 'cross newsgroup BODY by Message-ID'); + ok($n->head(''), + 'cross newsgroup HEAD by Message-ID'); + is($n->xpath(''), 'x.y.z/1', 'xpath hit'); + is($n->xpath(''), undef, 'xpath miss'); + # pipelined requests: { my $nreq = 90; @@ -337,16 +333,24 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 # -compact requires Xapian SKIP: { require_mods('Search::Xapian', 2); - which('xapian-compact') or skip 'xapian-compact missing', 2; + have_xapian_compact or skip 'xapian-compact missing', 2; is(xsys(qw(git config), "--file=$home/.public-inbox/config", "publicinbox.$group.indexlevel", 'medium'), 0, 'upgraded indexlevel'); my $ex = eml_load('t/data/0001.patch'); is($n->article($ex->header('Message-ID')), undef, 'article did not exist'); + my $im = $ibx->importer(0); $im->add($ex); $im->done; - ok(run_script([qw(-index --reindex -c), $ibx->{inboxdir}], + { + my $f = $ibx->mm->{dbh}->sqlite_db_filename; + my $tmp = "$tmpdir/tmp.sqlite3"; + $ibx->mm->{dbh}->sqlite_backup_to_file($tmp); + delete $ibx->{mm}; + rename($tmp, $f) or BAIL_OUT "rename($tmp, $f): $!"; + } + ok(run_script([qw(-index -c -j0 --reindex), $ibx->{inboxdir}], undef, $noerr), '-compacted'); select(undef, undef, undef, $fast_idle ? 0.1 : 2.1); $art = $n->article($ex->header('Message-ID')); @@ -354,9 +358,11 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 $lsof or skip 'lsof missing', 1; ($^O =~ /\A(?:linux)\z/) or skip "lsof /(deleted)/ check untested on $^O", 1; - my @of = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); - is(scalar(grep(/\(deleted\)/, @of)), 0, 'no deleted files'); + my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); + my $d = [ grep(/\(deleted\)/, @lsof) ]; + is_deeply($d, [], 'no deleted files') or diag explain($d); }; + SKIP: { test_watch($tmpdir, $host_port, $group) }; { setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); syswrite($s, 'HDR List-id 1-'); @@ -396,4 +402,55 @@ sub read_til_dot { $buf; } +sub test_watch { + my ($tmpdir, $host_port, $group) = @_; + use_ok 'PublicInbox::Watch'; + use_ok 'PublicInbox::InboxIdle'; + use_ok 'PublicInbox::Config'; + require_git('1.8.5', 1) or skip('git 1.8.5+ needed for --urlmatch', 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 = 'watchnntp'; + my $addr = "i1\@example.com"; + my $url = "http://example.com/i1"; + my $inboxdir = "$tmpdir/watchnntp"; + my $cmd = ['-init', '-V1', '-Lbasic', $name, $inboxdir, $url, $addr]; + my $nntpurl = "nntp://$host_port/$group"; + run_script($cmd) or BAIL_OUT("init $name"); + xsys(qw(git config), "--file=$home/.public-inbox/config", + "publicinbox.$name.watch", + $nntpurl) == 0 or BAIL_OUT "git config $?"; + # try again with polling + xsys(qw(git config), "--file=$home/.public-inbox/config", + 'nntp.PollInterval', 0.11) == 0 + or BAIL_OUT "git config $?"; + my $cfg = PublicInbox::Config->new; + PublicInbox::DS->Reset; + my $ii = PublicInbox::InboxIdle->new($cfg); + my $cb = sub { PublicInbox::DS->SetPostLoopCallback(sub {}) }; + 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, '<', $watcherr or BAIL_OUT $!; + my $w = start_script(['-watch'], undef, { 2 => $err_wr }); + + diag 'waiting for initial fetch...'; + PublicInbox::DS::event_loop(); + diag 'inbox unlocked on initial fetch'; + $w->kill; + $w->join; + is($?, 0, 'no error in exited -watch process'); + $cfg->each_inbox(sub { shift->unsubscribe_unlock('ident') }); + $ii->close; + PublicInbox::DS->Reset; + my @err = grep(!/^(?:I:|#)/, <$err>); + is(@err, 0, 'no warnings/errors from -watch'.join(' ', @err)); + my @ls = xqx(['git', "--git-dir=$inboxdir", qw(ls-tree -r HEAD)]); + isnt(scalar(@ls), 0, 'imported something'); +} + 1;