X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=3698f98baccc5d4f119d1dddda274700c75f494e;hb=cfb8d16578e7f2f2e300f9f436205e4a8fc7f322;hp=8a721e2098eb5556a8022fa1f22d4b3afb2304cb;hpb=bb93ee6601ac6ca5fb6ff0e9d4d1cfcbb73e7f58;p=public-inbox.git diff --git a/t/nntpd.t b/t/nntpd.t index 8a721e20..3698f98b 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -1,12 +1,14 @@ -# Copyright (C) 2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2015-2018 all contributors +# License: AGPL-3.0+ use strict; use warnings; use Test::More; -eval { require PublicInbox::SearchIdx }; -plan skip_all => "Xapian missing for nntpd" if $@; -eval { require PublicInbox::Msgmap }; -plan skip_all => "DBD::SQLite missing for nntpd" if $@; +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; @@ -14,28 +16,23 @@ use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); use File::Temp qw/tempdir/; use Net::NNTP; -use IPC::Run qw(run); -use Data::Dumper; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); 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 $mainrepo = "$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'; +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, @@ -45,29 +42,60 @@ my %opts = ( ); 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; - system($init, $group, $maindir, 'http://example.com/', $addr); + 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 $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 { - local $ENV{ORIGINAL_RECIPIENT} = $addr; - my $simple = Email::Simple->new(< -To: You + my $mime = Email::MIME->new(< +From: =?utf-8?Q?El=C3=A9anor?= Cc: $addr Message-Id: -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 -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($mainrepo, 1); + $s->index_sync; + } } ok($sock, 'sock created'); @@ -95,6 +123,7 @@ EOF 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'); %opts = ( PeerAddr => $host_port, @@ -105,10 +134,10 @@ EOF my $mid = ''; my %xhdr = ( 'message-id' => $mid, - 'subject' => 'hihi', + subject => "Testing for El\xc3\xa9anor", 'date' => 'Thu, 01 Jan 1970 06:06:06 +0000', - 'from' => 'Me ', - 'to' => 'You ', + 'from' => "El\xc3\xa9anor ", + 'to' => "El\xc3\xa9anor ", 'cc' => $addr, 'xref' => "example.com $group:1" ); @@ -118,6 +147,20 @@ EOF is($buf, "201 server ready - post via email\r\n", 'got greeting'); $s->autoflush(1); + 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); + sysread($s, $buf, 4096); + is($buf, "201 server ready - post via email\r\n", 'got greeting'); + $s->autoflush(1); + + 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 }, "XHDR $k by message-id works"); @@ -125,14 +168,11 @@ EOF "$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'); } @@ -145,42 +185,99 @@ EOF } is_deeply($n->xover('1-'), { - '1' => ['hihi', - 'Me ', + '1' => ["Testing for El\xc3\xa9anor", + "El\xc3\xa9anor ", 'Thu, 01 Jan 1970 06:06:06 +0000', '', '', - '202', + $len, '1' ] }, "XOVER range works"); is_deeply($n->xover('1'), { - '1' => ['hihi', - 'Me ', + '1' => ["Testing for El\xc3\xa9anor", + "El\xc3\xa9anor ", 'Thu, 01 Jan 1970 06:06:06 +0000', '', '', - '202', + $len, '1' ] }, "XOVER by article works"); + is_deeply($n->head(1), $n->head(''), 'HEAD OK'); + is_deeply($n->body(1), $n->body(''), '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(''), 'ARTICLE OK'); + is($n->article(999), undef, 'non-existent num'); + is($n->article(''), 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 \t" . + 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\t202\t1", 'OVER by Message-ID works'); + "$mid\t\t$len\t1", 'OVER by Message-ID works'); is($r[2], '.', 'correctly terminated response'); } - ok(kill('TERM', $pid), 'killed nntpd'); - $pid = undef; - waitpid(-1, 0); + 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(list-id 1-)), {}, + 'XHDR on invalid header returns empty'); + + my $mids = $n->newnews(0, '*'); + is_deeply($mids, [''], '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'); + } + + { + 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'); + select(undef, undef, undef, 0.15); + syswrite($s, "\r\n"); + $buf = ''; + do { + sysread($s, $buf, 4096, length($buf)); + } until ($buf =~ /\r\n\z/); + my @r = split("\r\n", $buf); + like($r[0], qr/^5\d\d /, + '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 $/; + 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'); } 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;