X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=6822219646ffe1f5b5cae2177bbff99544cb255f;hb=7b20e5135238a2780ac3df3198a02e9fbda4ba18;hp=6df19f322b6e03aaf91ba76f61a524d047be7604;hpb=0e6ceff37fc38f28a1520d7475f31d47f74ec7e6;p=public-inbox.git diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index 6df19f32..68222196 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -2,11 +2,14 @@ # License: AGPL-3.0+ # # Each instance of this represents a NNTP client socket +# fields: +# nntpd: PublicInbox::NNTPD ref +# article: per-session current article number +# ng: PublicInbox::Inbox ref +# long_cb: long_response private data package PublicInbox::NNTP; use strict; -use warnings; -use base qw(PublicInbox::DS); -use fields qw(nntpd article ng long_cb); +use parent qw(PublicInbox::DS); use PublicInbox::MID qw(mid_escape $MID_EXTRACT); use PublicInbox::Eml; use POSIX qw(strftime); @@ -45,16 +48,15 @@ sub greet ($) { $_[0]->write($_[0]->{nntpd}->{greet}) }; sub new ($$$) { my ($class, $sock, $nntpd) = @_; - my $self = fields::new($class); + my $self = bless { nntpd => $nntpd }, $class; my $ev = EPOLLIN; my $wbuf; if ($sock->can('accept_SSL') && !$sock->accept_SSL) { return CORE::close($sock) if $! != EAGAIN; - $ev = PublicInbox::TLS::epollbit(); + $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock); $wbuf = [ \&PublicInbox::DS::accept_tls_step, \&greet ]; } $self->SUPER::new($sock, $ev | EPOLLONESHOT); - $self->{nntpd} = $nntpd; if ($wbuf) { $self->{wbuf} = $wbuf; } else { @@ -134,29 +136,29 @@ sub list_headers ($;$) { sub list_active ($;$) { my ($self, $wildmat) = @_; wildmat2re($wildmat); - foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - $ng->{newsgroup} =~ $wildmat or next; - group_line($self, $ng); + my $groups = $self->{nntpd}->{groups}; + for my $ngname (grep(/$wildmat/, @{$self->{nntpd}->{groupnames}})) { + group_line($self, $groups->{$ngname}); } } sub list_active_times ($;$) { my ($self, $wildmat) = @_; wildmat2re($wildmat); - foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - $ng->{newsgroup} =~ $wildmat or next; - my $c = eval { $ng->mm->created_at } || time; - more($self, "$ng->{newsgroup} $c $ng->{-primary_address}"); + my $groups = $self->{nntpd}->{groups}; + for my $ngname (grep(/$wildmat/, @{$self->{nntpd}->{groupnames}})) { + my $ibx = $groups->{$ngname}; + my $c = eval { $ibx->uidvalidity } // time; + more($self, "$ngname $c $ibx->{-primary_address}"); } } sub list_newsgroups ($;$) { my ($self, $wildmat) = @_; wildmat2re($wildmat); - foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - $ng->{newsgroup} =~ $wildmat or next; - my $d = $ng->description; - more($self, "$ng->{newsgroup} $d"); + my $groups = $self->{nntpd}->{groups}; + for my $ngname (grep(/$wildmat/, @{$self->{nntpd}->{groupnames}})) { + more($self, "$ngname ".$groups->{$ngname}->description); } } @@ -242,7 +244,7 @@ sub parse_time ($$;$) { sub group_line ($$) { my ($self, $ng) = @_; my ($min, $max) = $ng->mm->minmax; - more($self, "$ng->{newsgroup} $max $min n") if defined $min && defined $max; + more($self, "$ng->{newsgroup} $max $min n"); } sub cmd_newgroups ($$$;$$) { @@ -253,7 +255,7 @@ sub cmd_newgroups ($$$;$$) { # TODO dists more($self, '231 list of new newsgroups follows'); foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - my $c = eval { $ng->mm->created_at } || 0; + my $c = eval { $ng->uidvalidity } // 0; next unless $c > $ts; group_line($self, $ng); } @@ -341,8 +343,6 @@ sub cmd_group ($$) { $self->{ng} = $ng; my ($min, $max) = $ng->mm->minmax; - $min ||= 0; - $max ||= 0; $self->{article} = $min; my $est_size = $max - $min; "211 $est_size $min $max $group"; @@ -409,14 +409,10 @@ 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 - # reason. We'll fake the shortest one possible. - $hdr->header_set('Path', 'y'); - # leafnode (and maybe other NNTP clients) have trouble dealing # with v2 messages which have multiple Message-IDs (either due # to our own content-based dedupe or buggy git-send-email versions). @@ -430,22 +426,31 @@ sub set_nntp_headers ($$$) { $hdr->header_set('X-Alt-Message-ID', @alt); } - # clobber some - my $ng = $self->{ng}; - my $xref = xref($self, $ng, $smsg->{num}, $mid); + # clobber some existing headers + 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', "{-primary_address}>"); - if (my $url = $ng->base_url) { + + # RFC 5536 3.1.4 + my ($server_name, $newsgroups) = split(/ /, $xref, 2); + $newsgroups =~ s/:[0-9]+\b//g; # drop NNTP article numbers + $newsgroups =~ tr/ /,/; + $hdr->header_set('Newsgroups', $newsgroups); + + # *something* here is required for leafnode, try to follow + # RFC 5536 3.1.5... + $hdr->header_set('Path', $server_name . '!not-for-mail'); + + header_append($hdr, 'List-Post', "{-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>"); } } -sub art_lookup ($$) { - my ($self, $art) = @_; +sub art_lookup ($$$) { + my ($self, $art, $code) = @_; my $ng = $self->{ng}; my ($n, $mid); my $err; @@ -481,7 +486,18 @@ find_mid: } found: my $smsg = $ng->over->get_art($n) or return $err; - $smsg; + $smsg->{-ibx} = $ng; + if ($code == 223) { # STAT + set_art($self, $n); + "223 $n <$smsg->{mid}> article retrieved - " . + "request text separately"; + } else { # HEAD | BODY | ARTICLE + $smsg->{nntp} = $self; + $smsg->{nntp_code} = $code; + set_art($self, $art); + # this dereferences to `undef' + ${git_async_cat($ng->git, $smsg->{blob}, \&blob_cb, $smsg)}; + } } sub msg_body_write ($$) { @@ -499,9 +515,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) @@ -511,16 +527,17 @@ 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 my ($bref, $oid, $type, $size, $smsg) = @_; my $self = $smsg->{nntp}; - my $code = $smsg->{nntp_code} // 220; + my $code = $smsg->{nntp_code}; 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 $smsg->{-ibx}->{inboxdir}\n"; return $self->requeue; } elsif ($smsg->{blob} ne $oid) { $self->close; @@ -530,12 +547,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); @@ -549,43 +566,22 @@ sub blob_cb { # called by git->cat_async via git_async_cat sub cmd_article ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); - return $smsg unless ref $smsg; - set_art($self, $art); - $smsg->{nntp} = $self; - git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg); - undef; + art_lookup($self, $art, 220); } sub cmd_head ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); - return $smsg unless ref $smsg; - set_art($self, $art); - $smsg->{nntp} = $self; - $smsg->{nntp_code} = 221; - git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg); - undef; + art_lookup($self, $art, 221); } sub cmd_body ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); - return $smsg unless ref $smsg; - set_art($self, $art); - $smsg->{nntp} = $self; - $smsg->{nntp_code} = 222; - git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg); - undef; + art_lookup($self, $art, 222); } sub cmd_stat ($;$) { my ($self, $art) = @_; - my $r = art_lookup($self, $art); - return $r unless ref $r; - my ($n, $mid) = @$r; - set_art($self, $art); - "223 $n <$mid> article retrieved - request text separately"; + art_lookup($self, $art, 223); # art may be msgid } sub cmd_ihave ($) { '435 article not wanted - do not send it' }