-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2020 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;
-foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
- eval "require $mod";
- plan skip_all => "$mod missing for nntpd.t" if $@;
-}
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite));
require PublicInbox::SearchIdx;
require PublicInbox::Msgmap;
-use Cwd;
+require PublicInbox::InboxWritable;
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 Socket qw(IPPROTO_TCP TCP_NODELAY);
use Net::NNTP;
-use IPC::Run qw(run);
-use Data::Dumper;
+use Sys::Hostname;
+
+# FIXME: make easier to test both versions
+my $version = $ENV{PI_TEST_VERSION} || 2;
+require_git('2.6') if $version == 2;
-my $tmpdir = tempdir(CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $home = "$tmpdir/pi-home";
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
-my $pi_home = "$home/.public-inbox";
-my $pi_config = "$pi_home/config";
-my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
+my $inboxdir = "$tmpdir/main.git";
my $group = 'test-nntpd';
my $addr = $group . '@example.com';
-my $cfgpfx = "publicinbox.$group";
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
-my $mda = 'blib/script/public-inbox-mda';
-my $nntpd = 'blib/script/public-inbox-nntpd';
-my $init = 'blib/script/public-inbox-init';
-my $index = 'blib/script/public-inbox-index';
-
-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;
-END { kill 'TERM', $pid if defined $pid };
+SKIP: {
+ skip "git 2.6+ required for V2Writable", 1 if $version == 1;
+ use_ok 'PublicInbox::V2Writable';
+}
+
+my %opts;
+my $sock = tcp_server();
+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;
- system($init, $group, $maindir, 'http://example.com/', $addr);
+ my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
+ push @cmd, "-V$version", '-Lbasic';
+ ok(run_script(\@cmd), 'init OK');
+ is(system(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;
# ensure successful message delivery
{
- local $ENV{ORIGINAL_RECIPIENT} = $addr;
- my $simple = Email::Simple->new(<<EOF);
-From: Me <me\@example.com>
-To: You <you\@example.com>
+ my $mime = Email::MIME->new(<<EOF);
+To: =?utf-8?Q?El=C3=A9anor?= <you\@example.com>
+From: =?utf-8?Q?El=C3=A9anor?= <me\@example.com>
Cc: $addr
Message-Id: <nntp\@example.com>
-Subject: hihi
+Content-Type: text/plain; charset=utf-8
+Subject: Testing for =?utf-8?Q?El=C3=A9anor?=
Date: Thu, 01 Jan 1970 06:06:06 +0000
+Content-Transfer-Encoding: 8bit
+References: <ref tab squeezed>
-nntp
+This is a test message for El\xc3\xa9anor
EOF
- my $in = $simple->as_string;
- local $ENV{PATH} = $main_path;
- IPC::Run::run([$mda], \$in);
- is(0, $?, 'ran MDA correctly');
- is(0, system($index, $maindir), 'indexed git dir');
+ 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($ibx, 1);
+ $s->index_sync;
+ }
}
ok($sock, 'sock created');
- $! = 0;
- my $fl = fcntl($sock, F_GETFD, 0);
- ok(! $!, 'no error from fcntl(F_GETFD)');
- is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)');
- $pid = fork;
- if ($pid == 0) {
- use POSIX qw(dup2);
- # pretend to be systemd
- fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC);
- dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
- $ENV{LISTEN_PID} = $$;
- $ENV{LISTEN_FDS} = 1;
- exec $nntpd, "--stdout=$out", "--stderr=$err";
- die "FAIL: $!\n";
- }
- ok(defined $pid, 'forked nntpd process successfully');
- $! = 0;
- fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC);
- ok(! $!, 'no error from fcntl(F_SETFD)');
+ 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;
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);
+ eval {
+ IO::Socket::SSL->VERSION(2.007);
+ } or skip(<<EOF, 2);
+IO::Socket::SSL <2.007 not supported by Net::NNTP
+EOF
+ 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 = '<nntp@example.com>';
my %xhdr = (
'message-id' => $mid,
- 'subject' => 'hihi',
+ subject => "Testing for El\xc3\xa9anor",
'date' => 'Thu, 01 Jan 1970 06:06:06 +0000',
- 'from' => 'Me <me@example.com>',
- 'to' => 'You <you@example.com>',
+ 'from' => "El\xc3\xa9anor <me\@example.com>",
+ 'to' => "El\xc3\xa9anor <you\@example.com>",
'cc' => $addr,
- 'xref' => "example.com $group:1"
+ 'xref' => hostname . " $group:1",
+ 'references' => '<reftabsqueezed>',
);
- 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 = tcp_connect($sock);
+ sysread($s, $buf, 4096);
+ 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);
+ like($buf, qr/\A231 list of /, 'newgroups OK');
while (my ($k, $v) = each %xhdr) {
is_deeply($n->xhdr("$k $mid"), { $mid => $v },
"$k by article number works");
is_deeply($n->xhdr("$k 1-"), { 1 => $v },
"$k by article range works");
- next;
$buf = '';
syswrite($s, "HDR $k $mid\r\n");
- do {
- sysread($s, $buf, 4096, length($buf));
- } until ($buf =~ /\r\n\.\r\n\z/);
+ $buf = read_til_dot($s);
my @r = split("\r\n", $buf);
- like($r[0], qr/\A224 /, '224 response for HDR');
+ like($r[0], qr/\A225 /, '225 response for HDR');
is($r[1], "0 $v", 'got expected response for HDR');
}
}
is_deeply($n->xover('1-'), {
- '1' => ['hihi',
- 'Me <me@example.com>',
+ '1' => ["Testing for El\xc3\xa9anor",
+ "El\xc3\xa9anor <me\@example.com>",
'Thu, 01 Jan 1970 06:06:06 +0000',
'<nntp@example.com>',
- '',
- '202',
- '1' ] }, "XOVER range works");
+ '<reftabsqueezed>',
+ $len,
+ '1',
+ 'Xref: '. hostname . ' test-nntpd:1'] },
+ "XOVER range works");
is_deeply($n->xover('1'), {
- '1' => ['hihi',
- 'Me <me@example.com>',
+ '1' => ["Testing for El\xc3\xa9anor",
+ "El\xc3\xa9anor <me\@example.com>",
'Thu, 01 Jan 1970 06:06:06 +0000',
'<nntp@example.com>',
- '',
- '202',
- '1' ] }, "XOVER by article works");
+ '<reftabsqueezed>',
+ $len,
+ '1',
+ 'Xref: '. hostname . ' test-nntpd:1'] },
+ "XOVER by article works");
+
+ is_deeply($n->head(1), $n->head('<nntp@example.com>'), 'HEAD OK');
+ is_deeply($n->body(1), $n->body('<nntp@example.com>'), 'BODY OK');
+ is($n->body(1)->[0], "This is a test message for El\xc3\xa9anor\n",
+ 'body really matches');
+ my $art = $n->article(1);
+ is(ref($art), 'ARRAY', 'got array for ARTICLE');
+ is_deeply($art, $n->article('<nntp@example.com>'), 'ARTICLE OK');
+ is($n->article(999), undef, 'non-existent num');
+ is($n->article('<non-existent@example>'), undef, 'non-existent mid');
{
syswrite($s, "OVER $mid\r\n");
- $buf = '';
- do {
- sysread($s, $buf, 4096, length($buf));
- } until ($buf =~ /\r\n\.\r\n\z/);
+ $buf = read_til_dot($s);
my @r = split("\r\n", $buf);
like($r[0], qr/^224 /, 'got 224 response for OVER');
- is($r[1], "0\thihi\tMe <me\@example.com>\t" .
+ is($r[1], "0\tTesting for El\xc3\xa9anor\t" .
+ "El\xc3\xa9anor <me\@example.com>\t" .
"Thu, 01 Jan 1970 06:06:06 +0000\t" .
- "$mid\t\t202\t1", 'OVER by Message-ID works');
+ "$mid\t<reftabsqueezed>\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 => '<reftabsqueezed>' },
+ 'XHDR References 1- works)');
is_deeply($n->xhdr(qw(list-id 1-)), {},
'XHDR on invalid header returns empty');
+ my $mids = $n->newnews(0, '*');
+ is_deeply($mids, ['<nntp@example.com>'], 'NEWNEWS works');
+ {
+ my $t0 = time;
+ my $date = $n->date;
+ my $t1 = time;
+ ok($date >= $t0, 'valid date after start');
+ ok($date <= $t1, 'valid date before stop');
+ }
+ if ('leafnode interop') {
+ my $for_leafnode = PublicInbox::MIME->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>");
+ $im->add($for_leafnode);
+ $im->done;
+ if ($version == 1) {
+ my $s = PublicInbox::SearchIdx->new($ibx, 1);
+ $s->index_sync;
+ }
+ 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 = '';
+ $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');
+ }
+ }
+
+ # pipelined requests:
+ {
+ my $nreq = 90;
+ syswrite($s, "GROUP $group\r\n");
+ my $res = <$s>;
+ my $rdr = fork;
+ if ($rdr == 0) {
+ use POSIX qw(_exit);
+ for (1..$nreq) {
+ <$s> =~ /\A224 / or _exit(1);
+ <$s> =~ /\A1/ or _exit(2);
+ <$s> eq ".\r\n" or _exit(3);
+ }
+ _exit(0);
+ }
+ for (1..$nreq) {
+ syswrite($s, "XOVER 1\r\n");
+ }
+ is($rdr, waitpid($rdr, 0), 'reader done');
+ is($? >> 8, 0, 'no errors');
+ }
+ SKIP: {
+ if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//1)) {
+ skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1;
+ }
+ my @of = `lsof -p $td->{pid} 2>/dev/null`;
+ skip('lsof broken', 1) if (!scalar(@of) || $?);
+ my @xap = grep m!Search/Xapian!, @of;
+ is_deeply(\@xap, [], 'Xapian not loaded in nntpd');
+ }
{
- syswrite($s, "HDR List-id 1-\r\n");
+ setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1);
+ syswrite($s, 'HDR List-id 1-');
+ select(undef, undef, undef, 0.15);
+ ok($td->kill, 'killed nntpd');
+ select(undef, undef, undef, 0.15);
+ syswrite($s, "\r\n");
$buf = '';
do {
sysread($s, $buf, 4096, length($buf));
is(scalar @r, 1, 'only one response line');
}
- ok(kill('TERM', $pid), 'killed nntpd');
- $pid = undef;
- waitpid(-1, 0);
+ $n = $s = undef;
+ $td->join;
+ my $eout = eval {
+ local $/;
+ open my $fh, '<', $err or die "open $err failed: $!";
+ <$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 {
+ my ($s) = @_;
+ my $buf = '';
+ do {
+ sysread($s, $buf, 4096, length($buf));
+ } until ($buf =~ /\r\n\.\r\n\z/);
+ $buf;
+}
+
1;