X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fnntpd.t;h=34e9e1b45462675d175f807fc6a1bdc38477334f;hp=ea0d293947b9d42114d94144a98927ae1ff50c42;hb=1c3e60b66e01df89afdf74990a849a5a7386f9c7;hpb=aae578aad0fd1c7b788a461fa29cb70f0a29fb02 diff --git a/t/nntpd.t b/t/nntpd.t index ea0d2939..34e9e1b4 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -1,135 +1,114 @@ -# Copyright (C) 2015-2018 all contributors +#!perl -w +# Copyright (C) all contributors # License: AGPL-3.0+ -use strict; -use warnings; -use Test::More; -foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) { - eval "require $mod"; - plan skip_all => "$mod missing for nntpd.t" if $@; -} -require PublicInbox::SearchIdx; -require PublicInbox::Msgmap; -use Cwd; -use Email::Simple; -use IO::Socket; -use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); -use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); -use File::Temp qw/tempdir/; +use strict; use v5.10.1; use PublicInbox::TestCommon; +require_mods(qw(DBD::SQLite)); +use PublicInbox::Eml; +use Socket qw(IPPROTO_TCP TCP_NODELAY); use Net::NNTP; +use Sys::Hostname; +use POSIX qw(_exit); +use Digest::SHA; + +# t/nntpd-v2.t wraps this for v2 +my $version = $ENV{PI_TEST_VERSION} || 1; +require_git('2.6') if $version == 2; +use_ok 'PublicInbox::Msgmap'; +my $lsof = require_cmd('lsof', 1); +my $fast_idle = eval { require Linux::Inotify2; 1 } // + eval { require IO::KQueue; 1 }; -my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($tmpdir, $for_destroy) = tmpdir(); my $home = "$tmpdir/pi-home"; my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; -my $mainrepo = "$tmpdir/main.git"; +my $inboxdir = "$tmpdir/inbox"; my $group = 'test-nntpd'; my $addr = $group . '@example.com'; -my $nntpd = 'blib/script/public-inbox-nntpd'; -my $init = 'blib/script/public-inbox-init'; -use_ok 'PublicInbox::Import'; -use_ok 'PublicInbox::Inbox'; -use_ok 'PublicInbox::Git'; -use_ok 'PublicInbox::V2Writable'; - -# XXX FIXME: make it easier to test both versions -my $version = int($ENV{PI_VERSION} || 1); -my %opts = ( - LocalAddr => '127.0.0.1', - ReuseAddr => 1, - Proto => 'tcp', - Type => SOCK_STREAM, - Listen => 1024, -); -my $sock = IO::Socket::INET->new(%opts); -my $pid; -my $len; -END { kill 'TERM', $pid if defined $pid }; - -my $ibx = { - mainrepo => $mainrepo, - name => $group, - version => $version, - -primary_address => $addr, -}; -$ibx = PublicInbox::Inbox->new($ibx); -{ - local $ENV{HOME} = $home; - my @cmd = ($init, $group, $mainrepo, 'http://example.com/', $addr); - push @cmd, "-V$version"; - is(system(@cmd), 0, 'init OK'); - is(system(qw(git config), "--file=$home/.public-inbox/config", - "publicinbox.$group.newsgroup", $group), - 0, 'enabled newsgroup'); - my $len; +my $sock = tcp_server(); +my $host_port = tcp_host_port($sock); +my $td; - my $im; - if ($version == 2) { - $im = PublicInbox::V2Writable->new($ibx); - } elsif ($version == 1) { - my $git = PublicInbox::Git->new($mainrepo); - $im = PublicInbox::Import->new($git, 'test', $addr); - } else { - die "unsupported version: $version"; - } - - # ensure successful message delivery - { - my $mime = Email::MIME->new(<new(< From: =?utf-8?Q?El=C3=A9anor?= Cc: $addr Message-Id: Content-Type: text/plain; charset=utf-8 -Subject: Testing for =?utf-8?Q?El=C3=A9anor?= +Subject: Testing for =?utf-8?Q?El=C3=A9anor?= Date: Thu, 01 Jan 1970 06:06:06 +0000 Content-Transfer-Encoding: 8bit +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>"); - $len = length($mime->as_string); - $im->add($mime); - $im->done; - if ($version == 1) { - my $s = PublicInbox::SearchIdx->new($mainrepo, 1); - $s->index_sync; - } - } +my $list_id = $addr; +$list_id =~ s/@/./; +$eml->header_set('List-Id', "<$list_id>"); +my $str = $eml->as_string; +$str =~ s/(?sockhost . ':' . $sock->sockport; +my $ibx = create_inbox "v$version", version => $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; + +{ + my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ]; + $td = start_script($cmd, undef, { 3 => $sock }); 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'); + # TODO: Net::NNTP::listgroup does not support range at the moment + + { + my $expect = [ qw(Subject: From: Date: Message-ID: + References: Bytes: Lines: Xref:full) ]; + is_deeply($n->overview_fmt, $expect, + 'RFC3977 8.4.2 compliant LIST OVERVIEW.FMT'); + } + SKIP: { + $n->can('starttls') or + skip('Net::NNTP too old to support STARTTLS', 2); + require_mods('IO::Socket::SSL', 2); + ok(!$n->starttls, 'STARTTLS fails when unconfigured'); + is($n->code, 580, 'got 580 code on server w/o TLS'); + }; - %opts = ( - PeerAddr => $host_port, - Proto => 'tcp', - Type => SOCK_STREAM, - Timeout => 1, - ); my $mid = ''; my %xhdr = ( 'message-id' => $mid, @@ -138,21 +117,36 @@ EOF 'from' => "El\xc3\xa9anor ", 'to' => "El\xc3\xa9anor ", 'cc' => $addr, - 'xref' => "example.com $group:1" + 'xref' => hostname . " $group:1", + 'references' => '', ); - my $s = IO::Socket::INET->new(%opts); + my $s = tcp_connect($sock); sysread($s, my $buf, 4096); - is($buf, "201 server ready - post via email\r\n", 'got greeting'); - $s->autoflush(1); + is($buf, "201 " . hostname . " ready - post via email\r\n", + 'got greeting'); + ok(syswrite($s, " \r\n"), 'wrote spaces'); + ok(syswrite($s, "\r\n"), 'wrote nothing'); syswrite($s, "NEWGROUPS\t19990424 000000 \033GMT\007\r\n"); is(0, sysread($s, $buf, 4096), 'GOT EOF on cntrl'); - $s = IO::Socket::INET->new(%opts); + $s = tcp_connect($sock); sysread($s, $buf, 4096); - is($buf, "201 server ready - post via email\r\n", 'got greeting'); - $s->autoflush(1); + is($buf, "201 " . hostname . " ready - post via email\r\n", + 'got greeting'); + + syswrite($s, "CAPABILITIES\r\n"); + $buf = read_til_dot($s); + like($buf, qr/\r\nVERSION 2\r\n/s, 'CAPABILITIES works'); + unlike($buf, qr/STARTTLS/s, 'STARTTLS not advertised'); + my $deflate_capa = qr/\r\nCOMPRESS DEFLATE\r\n/; + if (eval { require Compress::Raw::Zlib }) { + like($buf, $deflate_capa, 'DEFLATE advertised'); + } else { + unlike($buf, $deflate_capa, + 'DEFLATE not advertised (Compress::Raw::Zlib missing)'); + } syswrite($s, "NEWGROUPS 19990424 000000 GMT\r\n"); $buf = read_til_dot($s); @@ -186,21 +180,26 @@ EOF "El\xc3\xa9anor ", 'Thu, 01 Jan 1970 06:06:06 +0000', '', - '', + '', $len, - '1' ] }, "XOVER range works"); + '1', + 'Xref: '. hostname . ' test-nntpd:1'] }, + "XOVER range works"); is_deeply($n->xover('1'), { '1' => ["Testing for El\xc3\xa9anor", "El\xc3\xa9anor ", 'Thu, 01 Jan 1970 06:06:06 +0000', '', - '', + '', $len, - '1' ] }, "XOVER by article works"); + '1', + 'Xref: '. hostname . ' test-nntpd:1'] }, + "XOVER by article works"); 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); @@ -217,17 +216,21 @@ EOF is($r[1], "0\tTesting for El\xc3\xa9anor\t" . "El\xc3\xa9anor \t" . "Thu, 01 Jan 1970 06:06:06 +0000\t" . - "$mid\t\t$len\t1", 'OVER by Message-ID works'); + "$mid\t\t$len\t1" . + "\tXref: " . hostname . " test-nntpd:0", + 'OVER by Message-ID works'); is($r[2], '.', 'correctly terminated response'); } is_deeply($n->xhdr(qw(Cc 1-)), { 1 => 'test-nntpd@example.com' }, 'XHDR Cc 1- works'); - is_deeply($n->xhdr(qw(References 1-)), { 1 => '' }, - 'XHDR References 1- works (empty string)'); + is_deeply($n->xhdr(qw(References 1-)), { 1 => '' }, + 'XHDR References 1- works)'); is_deeply($n->xhdr(qw(list-id 1-)), {}, 'XHDR on invalid header returns empty'); + my $mids = $n->newnews(0, $group); + is_deeply($mids, [''], 'NEWNEWS works'); { my $t0 = time; my $date = $n->date; @@ -235,12 +238,136 @@ EOF ok($date >= $t0, 'valid date after start'); ok($date <= $t1, 'valid date before stop'); } + if ('leafnode interop') { + my $for_leafnode = PublicInbox::Eml->new(<<""); +From: longheader\@example.com +To: $addr +Subject: none +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; + 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'); + ok(scalar(grep(/^Path:/, @$hdr)), 'Path: header found'); + + # it's possible for v2 messages to have 2+ Message-IDs, + # but leafnode can't handle it + if ($version != 1) { + my @mids = ("<$long_hdr>", '<2mid@wtf>'); + $for_leafnode->header_set('Message-ID', @mids); + $for_leafnode->body_set('not-a-dupe'); + my $warn = ''; + local $SIG{__WARN__} = sub { $warn .= join('', @_) }; + $im->add($for_leafnode); + $im->done; + like($warn, qr/reused/, 'warned for reused MID'); + $hdr = $n->head('<2mid@wtf>'); + my @hmids = grep(/\AMessage-ID: /i, @$hdr); + is(scalar(@hmids), 1, 'Single Message-ID in header'); + like($hmids[0], qr/: <2mid\@wtf>/, 'got expected mid'); + } + } + + 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; + my $nart = 2; + syswrite($s, "GROUP $group\r\n"); + my $res = <$s>; + my $rdr = fork; + if ($rdr == 0) { + for (1..$nreq) { + <$s> =~ /\A224 / or _exit(1); + <$s> =~ /\A1/ or _exit(2); + <$s> eq ".\r\n" or _exit(3); + } + my %sums; + for (1..$nart) { + <$s> =~ /\A220 / or _exit(4); + my $dig = Digest::SHA->new(1); + while (my $l = <$s>) { + last if $l eq ".\r\n"; + $dig->add($l); + } + $dig = $dig->hexdigest; + $sums{$dig}++; + } + if ($nart) { + scalar(keys(%sums)) == 1 or _exit(5); + (values(%sums))[0] == $nart or _exit(6); + } + _exit(0); + } + for (1..$nreq) { + syswrite($s, "XOVER 1\r\n"); + } + syswrite($s, "ARTICLE 1\r\n" x $nart); + is($rdr, waitpid($rdr, 0), 'reader done'); + is($? >> 8, 0, 'no errors'); + } + my $noerr = { 2 => \(my $null) }; + SKIP: { + if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//2)) { + skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1; + } + $lsof or skip 'lsof missing', 1; + my @of = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); + skip('lsof broken', 1) if (!scalar(@of) || $?); + my @xap = grep m!Search/Xapian!, @of; + is_deeply(\@xap, [], 'Xapian not loaded in nntpd'); + } + # -compact requires Xapian + SKIP: { + require_mods('Search::Xapian', 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; + { + 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')); + ok($art, 'new article retrieved after compact'); + $lsof or skip 'lsof missing', 1; + ($^O =~ /\A(?:linux)\z/) or + skip "lsof /(deleted)/ check untested on $^O", 1; + 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-'); select(undef, undef, undef, 0.15); - ok(kill('TERM', $pid), 'killed nntpd'); + ok($td->kill, 'killed nntpd'); select(undef, undef, undef, 0.15); syswrite($s, "\r\n"); $buf = ''; @@ -252,18 +379,18 @@ EOF 'got 5xx response for unoptimized HDR'); is(scalar @r, 1, 'only one response line'); } - $n = $s = undef; - is($pid, waitpid($pid, 0), 'nntpd exited successfully'); - my $eout = eval { - local $/; + $td->join; + is($?, 0, 'no error in exited process'); + my $eout = do { open my $fh, '<', $err or die "open $err failed: $!"; + local $/; <$fh>; }; - is($?, 0, 'no error in exited process'); unlike($eout, qr/wide/i, 'no Wide character warnings'); } +$td = undef; done_testing(); sub read_til_dot { @@ -275,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;