From 305d728977def1df9ab57778f9cad9dd834ce73d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 10 Sep 2020 09:38:39 +0000 Subject: nntp: fix cross-newsgroup Message-ID lookups We cannot blindly use the selected newsgroup for HEAD/ARTICLE/BODY requests using Message-ID, since those commands look across all newsgroups; not just the selected one (if any). So stuff a reference to the Inbox object into $smsg. We can reduce args passed into set_nntp_headers() and msg_hdr_write(), too. Fixes: 0e6ceff37fc38f28 ("nntp: support slow blob retrievals") --- t/nntpd.t | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 't/nntpd.t') diff --git a/t/nntpd.t b/t/nntpd.t index d8a44334..a3d974cf 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -27,7 +27,8 @@ 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/main"; +my $otherdir = "$tmpdir/other"; my $group = 'test-nntpd'; my $addr = $group . '@example.com'; @@ -46,9 +47,20 @@ my $ibx = { $ibx = PublicInbox::Inbox->new($ibx); { local $ENV{HOME} = $home; - my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr, + my @cmd = ('-init', $group, $inboxdir, 'http://example.com/abc', $addr, "-V$version", '-Lbasic', '--newsgroup', $group); - ok(run_script(\@cmd), 'init OK'); + ok(run_script(\@cmd), "init $group"); + + @cmd = ('-init', 'xyz', $otherdir, 'http://example.com/xyz', + 'e@example.com', "-V$version", qw(-Lbasic --newsgroup x.y.z)); + ok(run_script(\@cmd), 'init xyz'); + is(xsys([qw(git config -f), "$home/.public-inbox/config", + qw(publicinboxmda.spamcheck none)]), 0, 'disable spamcheck'); + + open(my $fh, '<', 't/utf8.eml') or BAIL_OUT("open t/utf8.eml: $!"); + my $env = { ORIGINAL_RECIPIENT => 'e@example.com' }; + run_script([qw(-mda --no-precheck)], $env, { 0 => $fh }) or + BAIL_OUT('-mda delivery'); my $len; $ibx = PublicInbox::InboxWritable->new($ibx); @@ -90,6 +102,7 @@ EOF 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'); @@ -229,7 +242,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; @@ -276,6 +289,13 @@ 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'); + # pipelined requests: { my $nreq = 90; -- cgit v1.2.3-24-ge0c7