-# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use warnings;
-use Test::More;
-use PublicInbox::TestCommon;
-use PublicInbox::Spawn qw(which);
-require_mods(qw(DBD::SQLite));
-require PublicInbox::InboxWritable;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Net::NNTP));
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;
-use_ok 'PublicInbox::Msgmap';
+use PublicInbox::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 };
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(<<EOF);
+my $eml = PublicInbox::Eml->new(<<EOF);
To: =?utf-8?Q?El=C3=A9anor?= <you\@example.com>
From: =?utf-8?Q?El=C3=A9anor?= <me\@example.com>
Cc: $addr
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/(?<!\r)\n/\r\n/sg;
- $len = length($str);
- undef $str;
- $im->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/(?<!\r)\n/\r\n/sg;
+my $len = length($str);
+undef $str;
+
+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;
+};
- ok($sock, 'sock created');
+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 <<EOF or BAIL_OUT;
+[publicinbox "$group"]
+ inboxdir = $inboxdir
+ url = http://example.com/abc
+ address = $addr
+ indexlevel = basic
+ newsgroup = $group
+[publicinbox "xyz"]
+ inboxdir = $other->{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 $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');
# TODO: Net::NNTP::listgroup does not support range at the moment
+ my $s = tcp_connect($sock);
+ sysread($s, my $buf, 4096);
+ is($buf, "201 " . hostname . " ready - post via email\r\n",
+ 'got greeting');
+ syswrite($s, "LISTGROUP $group 1-1\r\n");
+ $buf = read_til_dot($s);
+ like($buf, qr/\r\n1\r\n/s, 'LISTGROUP with range works');
{
my $expect = [ qw(Subject: From: Date: Message-ID:
'references' => '<reftabsqueezed>',
);
- my $s = tcp_connect($sock);
- sysread($s, my $buf, 4096);
+ $s = tcp_connect($sock);
+ sysread($s, $buf, 4096);
is($buf, "201 " . hostname . " ready - post via email\r\n",
'got greeting');
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, ['<nntp@example.com>'], 'NEWNEWS works');
{
my $t0 = time;
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');
}
}
+ ok($n->article('<testmessage@example.com>'),
+ 'cross newsgroup ARTICLE by Message-ID');
+ ok($n->body('<testmessage@example.com>'),
+ 'cross newsgroup BODY by Message-ID');
+ ok($n->head('<testmessage@example.com>'),
+ 'cross newsgroup HEAD by Message-ID');
+ is($n->xpath('<testmessage@example.com>'), 'x.y.z/1', 'xpath hit');
+ is($n->xpath('<non-existent@example.com>'), undef, 'xpath miss');
+
# pipelined requests:
{
my $nreq = 90;
my %sums;
for (1..$nart) {
<$s> =~ /\A220 / or _exit(4);
- my $dig = Digest::SHA->new(1);
+ my $dig = PublicInbox::SHA->new(1);
while (my $l = <$s>) {
last if $l eq ".\r\n";
$dig->add($l);
# -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;
{
delete $ibx->{mm};
rename($tmp, $f) or BAIL_OUT "rename($tmp, $f): $!";
}
- ok(run_script([qw(-index --reindex -c), $ibx->{inboxdir}],
+ ok(run_script([qw(-index -c -j0 --reindex), $ibx->{inboxdir}],
undef, $noerr), '-compacted');
- select(undef, undef, undef, $fast_idle ? 0.1 : 2.1);
+ tick($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 @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\)/, grep(!/batch-command\.err/, @lsof)) ];
+ is_deeply($d, [], 'no deleted files') or diag explain($d);
};
- SKIP: { test_watch($tmpdir, $sock, $group) };
+ 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);
+ tick(0.15);
ok($td->kill, 'killed nntpd');
- select(undef, undef, undef, 0.15);
+ tick(0.15);
syswrite($s, "\r\n");
$buf = '';
do {
}
sub test_watch {
- my ($tmpdir, $sock, $group) = @_;
- use_ok 'PublicInbox::WatchMaildir';
+ 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);
+ require_git('1.8.5', 4);
my $old_env = { HOME => $ENV{HOME} };
my $home = "$tmpdir/watch_home";
mkdir $home or BAIL_OUT $!;
my $url = "http://example.com/i1";
my $inboxdir = "$tmpdir/watchnntp";
my $cmd = ['-init', '-V1', '-Lbasic', $name, $inboxdir, $url, $addr];
- my ($ihost, $iport) = ($sock->sockhost, $sock->sockport);
- my $nntpurl = "nntp://$ihost:$iport/$group";
+ 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",
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';
$w->kill;
$w->join;
$cfg->each_inbox(sub { shift->unsubscribe_unlock('ident') });
$ii->close;
PublicInbox::DS->Reset;
- my @err = grep(!/^I:/, <$err>);
+ 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');