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")

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 595a4046d4fccff1249784aca9d022c656cb9e08..46398cd4896af40c4e550fb1e3c070c5f39d51b2 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -411,8 +411,8 @@ sub xref ($$$$) {
        $ret;
 }
 
-sub set_nntp_headers ($$$) {
-       my ($self, $hdr, $smsg) = @_;
+sub set_nntp_headers ($$) {
+       my ($hdr, $smsg) = @_;
        my ($mid) = $smsg->{mid};
 
        # why? leafnode requires a Path: header for some inexplicable
@@ -433,13 +433,13 @@ sub set_nntp_headers ($$$) {
        }
 
        # clobber some
-       my $ng = $self->{ng};
-       my $xref = xref($self, $ng, $smsg->{num}, $mid);
+       my $ibx = $smsg->{-ibx};
+       my $xref = xref($smsg->{nntp}, $ibx, $smsg->{num}, $mid);
        $hdr->header_set('Xref', $xref);
        $xref =~ s/:[0-9]+//g;
        $hdr->header_set('Newsgroups', (split(/ /, $xref, 2))[1]);
-       header_append($hdr, 'List-Post', "<mailto:$ng->{-primary_address}>");
-       if (my $url = $ng->base_url) {
+       header_append($hdr, 'List-Post', "<mailto:$ibx->{-primary_address}>");
+       if (my $url = $ibx->base_url) {
                $mid = mid_escape($mid);
                header_append($hdr, 'Archived-At', "<$url$mid/>");
                header_append($hdr, 'List-Archive', "<$url>");
@@ -483,6 +483,7 @@ find_mid:
        }
 found:
        my $smsg = $ng->over->get_art($n) or return $err;
+       $smsg->{-ibx} = $ng;
        $smsg;
 }
 
@@ -501,9 +502,9 @@ sub set_art {
        $self->{article} = $art if defined $art && $art =~ /\A[0-9]+\z/;
 }
 
-sub msg_hdr_write ($$$) {
-       my ($self, $eml, $smsg) = @_;
-       set_nntp_headers($self, $eml, $smsg);
+sub msg_hdr_write ($$) {
+       my ($eml, $smsg) = @_;
+       set_nntp_headers($eml, $smsg);
 
        my $hdr = $eml->{hdr} // \(my $x = '');
        # fixup old bug from import (pre-a0c07cba0e5d8b6a)
@@ -513,7 +514,7 @@ sub msg_hdr_write ($$$) {
        # for leafnode compatibility, we need to ensure Message-ID headers
        # are only a single line.
        $$hdr =~ s/^(Message-ID:)[ \t]*\r\n[ \t]+([^\r]+)\r\n/$1 $2\r\n/igsm;
-       $self->msg_more($$hdr);
+       $smsg->{nntp}->msg_more($$hdr);
 }
 
 sub blob_cb { # called by git->cat_async via git_async_cat
@@ -523,7 +524,7 @@ sub blob_cb { # called by git->cat_async via git_async_cat
        if (!defined($oid)) {
                # it's possible to have TOCTOU if an admin runs
                # public-inbox-(edit|purge), just move onto the next message
-               warn "E: $smsg->{blob} missing in $self->{ng}->{inboxdir}\n";
+               warn "E: $smsg->{blob} missing in $smsg->{-ibx}->{inboxdir}\n";
                return $self->requeue;
        } elsif ($smsg->{blob} ne $oid) {
                $self->close;
@@ -533,12 +534,12 @@ sub blob_cb { # called by git->cat_async via git_async_cat
        my $eml = PublicInbox::Eml->new($bref);
        if ($code == 220) {
                more($self, $r .= 'head and body follow');
-               msg_hdr_write($self, $eml, $smsg);
+               msg_hdr_write($eml, $smsg);
                $self->msg_more("\r\n");
                msg_body_write($self, $bref);
        } elsif ($code == 221) {
                more($self, $r .= 'head follows');
-               msg_hdr_write($self, $eml, $smsg);
+               msg_hdr_write($eml, $smsg);
        } elsif ($code == 222) {
                more($self, $r .= 'body follows');
                msg_body_write($self, $bref);
@@ -556,7 +557,7 @@ sub cmd_article ($;$) {
        return $smsg unless ref $smsg;
        set_art($self, $art);
        $smsg->{nntp} = $self;
-       ${git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+       ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)};
 }
 
 sub cmd_head ($;$) {
@@ -566,7 +567,7 @@ sub cmd_head ($;$) {
        set_art($self, $art);
        $smsg->{nntp} = $self;
        $smsg->{nntp_code} = 221;
-       ${git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+       ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)};
 }
 
 sub cmd_body ($;$) {
@@ -576,7 +577,7 @@ sub cmd_body ($;$) {
        set_art($self, $art);
        $smsg->{nntp} = $self;
        $smsg->{nntp_code} = 222;
-       ${git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+       ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)};
 }
 
 sub cmd_stat ($;$) {

diff --git a/t/nntp.t b/t/nntp.t
index 1db896cf46b5a6376929e8de6c501e28d8d0d6f0..9a482acba88eb91d95c45ad1475018b0144bbb1a 100644 (file)
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -113,8 +113,8 @@ use_ok 'PublicInbox::Inbox';
                nntpd => { grouplist => [], servername => 'example.com' },
                ng => $ng,
        };
-       my $smsg = { num => 1, mid => $mid };
-       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
+       my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ng };
+       PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
@@ -130,7 +130,7 @@ use_ok 'PublicInbox::Inbox';
 
        $ng->{-base_url} = 'http://mirror.example.com/m/';
        $smsg->{num} = 2;
-       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
+       PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ],

diff --git a/t/nntpd.t b/t/nntpd.t
index d8a44334a55bf13e0b0037a3b3c8ba3e90085df9..a3d974cfd2d92b6b6f1c995e9c720cc6287f0ce7 100644 (file)
--- 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, ['<nntp@example.com>'], 'NEWNEWS works');
        {
                my $t0 = time;
@@ -276,6 +289,13 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
                }
        }
 
+       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');
+
        # pipelined requests:
        {
                my $nreq = 90;