# Copyright (C) 2015 all contributors <meta@public-inbox.org>
# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+#
+# Each instance of this represents a NNTP client socket
package PublicInbox::NNTP;
use strict;
use warnings;
use base qw(Danga::Socket);
use fields qw(nntpd article rbuf ng long_res);
+use PublicInbox::Search;
use PublicInbox::Msgmap;
-use PublicInbox::GitCatFile;
+use PublicInbox::Git;
use PublicInbox::MID qw(mid2path);
use Email::MIME;
use Data::Dumper qw(Dumper);
use POSIX qw(strftime);
-use Time::HiRes qw(clock_gettime ualarm CLOCK_MONOTONIC);
+use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use constant {
r501 => '501 command syntax error',
r221 => '221 Header follows',
r224 => '224 Overview information follows (multi-line)',
+ r225 => '225 Headers follow (multi-line)',
r430 => '430 No article with that message-id',
long_response_limit => 0xffffffff,
};
sub now () { clock_gettime(CLOCK_MONOTONIC) };
-my @OVERVIEW = qw(Subject From Date Message-ID References Bytes Lines);
-my %OVERVIEW = map { $_ => 1 } @OVERVIEW;
+my @OVERVIEW = qw(Subject From Date Message-ID References);
+my $OVERVIEW_FMT = join(":\r\n", @OVERVIEW, qw(Bytes Lines)) . ":\r\n";
+my $LIST_HEADERS = join("\r\n", @OVERVIEW,
+ qw(:bytes :lines Xref To Cc)) . "\r\n";
# disable commands with easy DoS potential:
# LISTGROUP could get pretty bad, too...
my %DISABLED; # = map { $_ => 1 } qw(xover list_overview_fmt newnews xhdr);
+my $EXPMAP; # fd -> [ idle_time, $self ]
+my $EXPTIMER;
+our $EXPTIME = 180; # 3 minutes
+
+sub update_idle_time ($) {
+ my ($self) = @_;
+ my $tmp = $self->{sock} or return;
+ $tmp = fileno($tmp);
+ defined $tmp and $EXPMAP->{$tmp} = [ now(), $self ];
+}
+
+sub expire_old () {
+ my $now = now();
+ my $exp = $EXPTIME;
+ my $old = $now - $exp;
+ my $next = $now + $exp;
+ my $nr = 0;
+ my %new;
+ while (my ($fd, $v) = each %$EXPMAP) {
+ my ($idle_time, $nntp) = @$v;
+ if ($idle_time < $old) {
+ $nntp->close; # idempotent
+ } else {
+ my $nexp = $idle_time + $exp;
+ $next = $nexp if ($nexp < $next);
+ ++$nr;
+ $new{$fd} = $v;
+ }
+ }
+ $EXPMAP = \%new;
+ if ($nr) {
+ $next -= $now;
+ $next = 0 if $next < 0;
+ $EXPTIMER = Danga::Socket->AddTimer($next, *expire_old);
+ } else {
+ $EXPTIMER = undef;
+ # noop to kick outselves out of the loop so descriptors
+ # really get closed
+ Danga::Socket->AddTimer(0, sub {});
+ }
+}
+
sub new ($$$) {
my ($class, $sock, $nntpd) = @_;
my $self = fields::new($class);
res($self, '201 server ready - post via email');
$self->{rbuf} = '';
$self->watch_read(1);
+ update_idle_time($self);
+ $EXPTIMER ||= Danga::Socket->AddTimer($EXPTIME, *expire_old);
$self;
}
my $err = $@;
if ($err && !$self->{closed}) {
chomp($l = Dumper(\$l));
- err($self, "error from: $l $err");
+ err($self, 'error from: %s (%s)', $l, $err);
$res = '503 program fault - command not performed';
}
return 0 unless defined $res;
my ($self, $arg) = @_;
$arg = uc $arg;
return r501 unless $arg eq 'READER';
- '200 reader status acknowledged';
+ '201 Posting prohibited';
}
sub cmd_slave ($) { '202 slave status noted' }
'.'
}
-sub list_overview_fmt ($$) {
+sub list_overview_fmt ($) {
+ my ($self) = @_;
+ do_more($self, $OVERVIEW_FMT);
+}
+
+sub list_headers ($;$) {
my ($self) = @_;
- more($self, $_ . ':') foreach @OVERVIEW;
+ do_more($self, $LIST_HEADERS);
}
sub list_active ($;$) {
}
}
-# LIST SUBSCRIPTIONS not supported
+# LIST SUBSCRIPTIONS, DISTRIB.PATS are not supported
sub cmd_list ($;$$) {
my ($self, @args) = @_;
if (scalar @args) {
my $arg = shift @args;
$arg =~ tr/A-Z./a-z_/;
$arg = "list_$arg";
- return '503 function not performed' if $DISABLED{$arg};
+ return r501 if $DISABLED{$arg};
$arg = eval {
no strict 'refs';
sub hdr_val ($$) {
my ($r, $header) = @_;
- $header = lc $header;
- return $r->[3] if ($header eq 'bytes');
- return $r->[4] if ($header eq 'lines');
+ return $r->[3] if $header =~ /\A:?bytes\z/i;
+ return $r->[4] if $header =~ /\A:?lines\z/i;
$r = $r->[2]->header_obj->header($header);
defined $r or return;
$r =~ s/[\r\n\t]+/ /sg;
my ($self, $beg, $end, $cb) = @_;
die "BUG: nested long response" if $self->{long_res};
+ my $fd = $self->{fd};
+ defined $fd or return;
# make sure we disable reading during a long response,
# clients should not be sending us stuff and making us do more
# work while we are stream a response to them
$self->watch_read(0);
- my $fd = fileno $self->{sock};
my $t0 = now();
$self->{long_res} = sub {
# limit our own running time for fairness with other
# clients and to avoid buffering too much:
- my $yield;
- local $SIG{ALRM} = sub { $yield = 1 };
- ualarm(100000);
+ my $lim = 100;
my $err;
do {
eval { $cb->(\$beg) };
- } until (($err = $@) || $self->{closed} || $yield ||
- $self->{write_buf_size} || ++$beg > $end);
- ualarm(0);
+ } until (($err = $@) || $self->{closed} ||
+ ++$beg > $end || !--$lim || $self->{write_buf_size});
if ($err || $self->{closed}) {
$self->{long_res} = undef;
if ($err) {
err($self,
- "$err during long response[$fd] - %0.6f",
- now() - $t0);
+ "%s during long response[$fd] - %0.6f",
+ $err, now() - $t0);
}
if ($self->{closed}) {
out($self, " deferred[$fd] aborted - %0.6f",
now() - $t0);
} else {
+ update_idle_time($self);
$self->watch_read(1);
}
- } elsif ($yield || $self->{write_buf_size}) {
+ } elsif (!$lim || $self->{write_buf_size}) {
# no recursion, schedule another call ASAP
# but only after all pending writes are done
+ update_idle_time($self);
Danga::Socket->AddTimer(0, sub {
$self->write($self->{long_res});
});
return $r unless ref $r;
my $mm = $self->{ng}->mm;
my ($beg, $end) = @$r;
- more($self, '221 Header follows');
+ more($self, $xhdr ? r221 : r225);
$self->long_response($beg, $end, sub {
my ($i) = @_;
my $mid = $mm->mid_for($$i);
my $ng = $self->{ng};
my $mm = $ng->mm;
my ($beg, $end) = @$r;
- more($self, '221 Header follows');
+ more($self, $xhdr ? r221 : r225);
$self->long_response($beg, $end, sub {
my ($i) = @_;
my $mid = $mm->mid_for($$i);
}
}
-sub header_obj_for {
- my ($srch, $mid) = @_;
- eval {
- my $smsg = $srch->lookup_message($mid);
- $smsg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
- $smsg->mini_mime->header_obj;
- };
-};
+sub search_header_for {
+ my ($srch, $mid, $field) = @_;
+ my $smsg = $srch->lookup_message($mid) or return;
+ $smsg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
+ $smsg->$field;
+}
sub hdr_searchmsg ($$$$) {
- my ($self, $xhdr, $hdr, $range) = @_;
- my $filter;
- if ($hdr eq 'date') {
- $hdr = 'X-PI-TS';
- $filter = sub ($) {
- strftime('%a, %d %b %Y %T %z', gmtime($_[0]));
- };
- }
-
+ my ($self, $xhdr, $field, $range) = @_;
if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
my ($ng, $n) = mid_lookup($self, $1);
return r430 unless $n;
- if (my $srch = $ng->search) {
- my $m = header_obj_for($srch, $range);
- my $v = $m->header($hdr);
- $v = $filter->($v) if defined $v && $filter;
- hdr_mid_response($self, $xhdr, $ng, $n, $range, $v);
- } else {
- hdr_slow($self, $xhdr, $hdr, $range);
- }
+ my $v = search_header_for($ng->search, $range, $field);
+ hdr_mid_response($self, $xhdr, $ng, $n, $range, $v);
} else { # numeric range
$range = $self->{article} unless defined $range;
- my $srch = $self->{ng}->search or
- return hdr_slow($self, $xhdr, $hdr, $range);
+ my $srch = $self->{ng}->search;
my $mm = $self->{ng}->mm;
my $r = get_range($self, $range);
return $r unless ref $r;
my ($beg, $end) = @$r;
- more($self, '221 Header follows');
+ more($self, $xhdr ? r221 : r225);
+ my $off = 0;
$self->long_response($beg, $end, sub {
my ($i) = @_;
- my $mid = $mm->mid_for($$i) or return;
- my $m = header_obj_for($srch, $mid) or return;
- my $v = $m->header($hdr);
- defined $v or return;
- $v = $filter->($v) if $filter;
- more($self, "$$i $v");
+ my $res = $srch->query_xover($beg, $end, $off);
+ my $msgs = $res->{msgs};
+ my $nr = scalar @$msgs or return;
+ $off += $nr;
+ my $tmp = '';
+ foreach my $s (@$msgs) {
+ $tmp .= $s->num . ' ' . $s->$field . "\r\n";
+ }
+ do_more($self, $tmp);
+ # -1 to adjust for implicit increment in long_response
+ $$i = $nr ? $$i + $nr - 1 : long_response_limit;
});
}
}
hdr_message_id($self, $xhdr, $range);
} elsif ($sub eq 'xref') {
hdr_xref($self, $xhdr, $range);
- } elsif ($sub =~ /\A(subject|references|date)\z/) {
+ } elsif ($sub =~ /\A(?:subject|references|date|from|to|cc|
+ bytes|lines)\z/x) {
hdr_searchmsg($self, $xhdr, $sub, $range);
+ } elsif ($sub =~ /\A:(bytes|lines)\z/) {
+ hdr_searchmsg($self, $xhdr, $1, $range);
} else {
- hdr_slow($self, $xhdr, $header, $range);
+ $xhdr ? (r221 . "\r\n.") : "503 HDR not permitted on $header";
}
}
my $res = '';
if ($xhdr) {
$res .= r221 . "\r\n";
- $res .= "$mid $v\r\n" if defined $v;
+ $res .= "$mid $v\r\n";
} else {
- $res .= r224 . "\r\n";
- if (defined $v) {
- my $pfx = hdr_mid_prefix($self, $xhdr, $ng, $n, $mid);
- $res .= "$pfx $v\r\n";
- }
+ $res .= r225 . "\r\n";
+ my $pfx = hdr_mid_prefix($self, $xhdr, $ng, $n, $mid);
+ $res .= "$pfx $v\r\n";
}
res($self, $res .= '.');
undef;
}
-sub hdr_slow ($$$$) {
- my ($self, $xhdr, $header, $range) = @_;
-
- if (defined $range && $range =~ /\A<.+>\z/) { # Message-ID
- my $r = $self->art_lookup($range, 2);
- return $r unless ref $r;
- my ($n, $ng) = ($r->[0], $r->[5]);
- my $v = hdr_val($r, $header);
- hdr_mid_response($self, $xhdr, $ng, $n, $range, $v);
- } else { # numeric range
- $range = $self->{article} unless defined $range;
- my $r = get_range($self, $range);
- return $r unless ref $r;
- my ($beg, $end) = @$r;
- more($self, $xhdr ? r221 : r224);
- $self->long_response($beg, $end, sub {
- my ($i) = @_;
- $r = $self->art_lookup($$i, 2);
- return unless ref $r;
- defined($r = hdr_val($r, $header)) or return;
- more($self, "$$i $r");
- });
- }
-}
-
sub cmd_xrover ($;$) {
my ($self, $range) = @_;
my $ng = $self->{ng} or return '412 no newsgroup selected';
$self->long_response($beg, $end, sub {
my ($i) = @_;
my $mid = $mm->mid_for($$i) or return;
- my $m = header_obj_for($srch, $mid) or return;
- my $h = $m->header('references');
- more($self, "$$i $h") if defined $h;
+ my $h = search_header_for($srch, $mid, 'references');
+ more($self, "$$i $h");
});
}
sub over_line ($$) {
- my ($self, $r) = @_;
-
- more($self, join("\t", $r->[0], map {
- my $h = hdr_val($r, $_);
- defined $h ? $h : '';
- } @OVERVIEW ));
+ my ($num, $smsg) = @_;
+ # n.b. field access and procedural calls can be
+ # 10%-15% faster than OO method calls:
+ join("\t", $num,
+ $smsg->{subject},
+ $smsg->{from},
+ PublicInbox::SearchMsg::date($smsg),
+ '<'.PublicInbox::SearchMsg::mid($smsg).'>',
+ $smsg->{references},
+ PublicInbox::SearchMsg::bytes($smsg),
+ PublicInbox::SearchMsg::lines($smsg));
}
sub cmd_over ($;$) {
my ($self, $range) = @_;
- if ($range && $range =~ /\A<.+>\z/) {
- my $r = $self->art_lookup($range, 2);
- return '430 No article with that message-id' unless ref $r;
+ if ($range && $range =~ /\A<(.+)>\z/) {
+ my ($ng, $n) = mid_lookup($self, $1);
+ my $smsg = $ng->search->lookup_message($range) or
+ return '430 No article with that message-id';
more($self, '224 Overview information follows (multi-line)');
+ $smsg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
# Only set article number column if it's the current group
- my $ng = $self->{ng};
- $r->[0] = 0 if (!$ng || $ng ne $r->[5]);
- over_line($self, $r);
+ my $self_ng = $self->{ng};
+ $n = 0 if (!$self_ng || $self_ng ne $ng);
+ more($self, over_line($n, $smsg));
'.';
} else {
cmd_xover($self, $range);
return $r unless ref $r;
my ($beg, $end) = @$r;
more($self, "224 Overview information follows for $beg to $end");
+ my $srch = $self->{ng}->search;
+ my $off = 0;
$self->long_response($beg, $end, sub {
my ($i) = @_;
- my $r = $self->art_lookup($$i, 2);
- return unless ref $r;
- over_line($self, $r);
+ my $res = $srch->query_xover($beg, $end, $off);
+ my $msgs = $res->{msgs};
+ my $nr = scalar @$msgs or return;
+ $off += $nr;
+
+ # OVERVIEW.FMT
+ more($self, join("\r\n", map {
+ over_line(PublicInbox::SearchMsg::num($_), $_);
+ } @$msgs));
+
+ # -1 to adjust for implicit increment in long_response
+ $$i = $nr ? $$i + $nr - 1 : long_response_limit;
});
}
$self->do_write($data);
}
-# callbacks for by Danga::Socket
+# callbacks for Danga::Socket
sub event_hup { $_[0]->close }
sub event_err { $_[0]->close }
sub event_write {
my ($self) = @_;
+ update_idle_time($self);
# only continue watching for readability when we are done writing:
if ($self->write(undef) == 1 && !$self->{long_res}) {
$self->watch_read(1);
sub event_read {
my ($self) = @_;
use constant LINE_MAX => 512; # RFC 977 section 2.3
- my $line;
my $r = 1;
-again:
+
+ my $buf = $self->read(LINE_MAX) or return $self->close;
+ $self->{rbuf} .= $$buf;
while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]+)\r?\n//) {
- $line = $1;
+ my $line = $1;
my $t0 = now();
+ my $fd = $self->{fd};
$r = eval { $self->process_line($line) };
my $d = $self->{long_res} ?
- ' deferred['.fileno($self->{sock}).']' : '';
- out($self, "$line - %0.6f$d", now() - $t0);
- }
- unless (defined $line) {
- my $buf = $self->read(LINE_MAX) or return $self->close;
- $self->{rbuf} .= $$buf;
- goto again;
+ " deferred[$fd]" : '';
+ out($self, "[$fd] %s - %0.6f$d", $line, now() - $t0);
}
return $self->close if $r < 0;
my $len = length($self->{rbuf});
return $self->close if ($len >= LINE_MAX);
+ update_idle_time($self);
}
sub watch_read {
$rv;
}
+# for graceful shutdown in PublicInbox::Daemon:
sub busy () {
my ($self) = @_;
($self->{rbuf} ne '' || $self->{long_res} || $self->{write_buf_size});