use PublicInbox::Msgmap;
use PublicInbox::GitCatFile;
use PublicInbox::MID qw(mid2path);
-use Email::Simple;
+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_FMT = join(":\r\n", @OVERVIEW) . ":\r\n";
# disable commands with easy DoS potential:
# LISTGROUP could get pretty bad, too...
sub new ($$$) {
my ($class, $sock, $nntpd) = @_;
my $self = fields::new($class);
+ binmode $sock, ':utf8'; # RFC 3977
$self->SUPER::new($sock);
$self->{nntpd} = $nntpd;
res($self, '201 server ready - post via email');
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) = @_;
- more($self, $_ . ':') foreach @OVERVIEW;
+ do_more($self, $OVERVIEW_FMT);
}
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 parse_time ($$;$) {
my ($date, $time, $gmt) = @_;
use Time::Local qw();
- my ($YY, $MM, $DD) = unpack('A2A2A2', $date);
my ($hh, $mm, $ss) = unpack('A2A2A2', $time);
if (defined $gmt) {
$gmt =~ /\A(?:UTC|GMT)\z/i or die "GM invalid: $gmt\n";
$gmt = 1;
}
my @now = $gmt ? gmtime : localtime;
- if ($YY > strftime('%y', @now)) {
- my $cur_year = $now[5] + 1900;
- $YY += int($cur_year / 1000) * 1000 - 100;
+ my ($YYYY, $MM, $DD);
+ if (length($date) == 8) { # RFC 3977 allows YYYYMMDD
+ ($YYYY, $MM, $DD) = unpack('A4A2A2', $date);
+ } else { # legacy clients send YYMMDD
+ ($YYYY, $MM, $DD) = unpack('A2A2A2', $date);
+ if ($YYYY > strftime('%y', @now)) {
+ my $cur_year = $now[5] + 1900;
+ $YYYY += int($cur_year / 1000) * 1000 - 100;
+ }
}
-
if ($gmt) {
- Time::Local::timegm($ss, $mm, $hh, $DD, $MM - 1, $YY);
+ Time::Local::timegm($ss, $mm, $hh, $DD, $MM - 1, $YYYY);
} else {
- Time::Local::timelocal($ss, $mm, $hh, $DD, $MM - 1, $YY);
+ Time::Local::timelocal($ss, $mm, $hh, $DD, $MM - 1, $YYYY);
}
}
goto find_mid;
} elsif ($art =~ /\A<([^>]+)>\z/) {
$mid = $1;
- $err = '430 no such article found';
+ $err = r430;
$n = $ng->mm->num_for($mid) if $ng;
goto found if defined $n;
foreach my $g (values %{$self->{nntpd}->{groups}}) {
}
found:
my $o = 'HEAD:' . mid2path($mid);
- my $s = eval { Email::Simple->new($ng->gcf->cat_file($o)) };
+ my $bytes;
+ my $s = eval { Email::MIME->new($ng->gcf->cat_file($o, \$bytes)) };
return $err unless $s;
+ my $lines;
if ($set_headers) {
$s->header_set('Newsgroups', $ng->{name});
- $s->header_set('Lines', $s->body =~ tr!\n!\n!);
- $s->header_set('Xref', "$ng->{domain} $ng->{name}:$n");
+ $s->header_set('Xref', xref($ng, $n));
+ $lines = $s->body =~ tr!\n!\n!;
# must be last
- if ($set_headers == 2) {
- $s->header_set('Bytes', bytes::length($s->as_string));
- $s->body_set('');
- }
+ $s->body_set('') if ($set_headers == 2);
}
- [ $n, $mid, $s ];
+ [ $n, $mid, $s, $bytes, $lines, $ng ];
}
sub simple_body_write ($$) {
my $body = $s->body;
$s->body_set('');
$body =~ s/^\./../smg;
+ $body =~ s/(?<!\r)\n/\r\n/sg;
do_more($self, $body);
+ do_more($self, "\r\n") unless $body =~ /\r\n\z/s;
'.'
}
-sub header_str ($) {
- my ($s) = @_;
- my $h = $s->header_obj;
- $h->header_set('Bytes');
- $h->as_string
-}
-
sub set_art {
my ($self, $art) = @_;
$self->{article} = $art if defined $art && $art =~ /\A\d+\z/;
my ($n, $mid, $s) = @$r;
set_art($self, $art);
more($self, "220 $n <$mid> article retrieved - head and body follow");
- do_more($self, header_str($s));
+ do_more($self, $s->header_obj->as_string);
do_more($self, "\r\n");
simple_body_write($self, $s);
}
my ($n, $mid, $s) = @$r;
set_art($self, $art);
more($self, "221 $n <$mid> article retrieved - head follows");
- do_more($self, header_str($s));
+ do_more($self, $s->header_obj->as_string);
'.'
}
[ $beg, $end ];
}
-sub xhdr ($$) {
+sub hdr_val ($$) {
my ($r, $header) = @_;
+ 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;
} else {
$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
Danga::Socket->AddTimer(0, sub {
undef;
}
-sub xhdr_message_id ($$) { # optimize XHDR Message-ID [range] for slrnpull.
- my ($self, $range) = @_;
+sub hdr_message_id ($$$) { # optimize XHDR Message-ID [range] for slrnpull.
+ my ($self, $xhdr, $range) = @_;
- my $mm = $self->{ng}->mm;
if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
- my $n = $mm->num_for($range);
- more($self, '221 Header follows');
- more($self, "<$range> <$range>") if defined $n;
- '.';
+ my ($ng, $n) = mid_lookup($self, $1);
+ return r430 unless $n;
+ hdr_mid_response($self, $xhdr, $ng, $n, $range, $range);
} else { # numeric range
$range = $self->{article} unless defined $range;
my $r = get_range($self, $range);
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);
}
}
+sub xref ($$) {
+ my ($ng, $n) = @_;
+ "$ng->{domain} $ng->{name}:$n"
+}
+
+sub mid_lookup ($$) {
+ my ($self, $mid) = @_;
+ my $self_ng = $self->{ng};
+ if ($self_ng) {
+ my $n = $self_ng->mm->num_for($mid);
+ return ($self_ng, $n) if defined $n;
+ }
+ foreach my $ng (values %{$self->{nntpd}->{groups}}) {
+ next if defined $self_ng && $ng eq $self_ng;
+ my $n = $ng->mm->num_for($mid);
+ return ($ng, $n) if defined $n;
+ }
+ (undef, undef);
+}
+
+sub hdr_xref ($$$) { # optimize XHDR Xref [range] for rtin
+ my ($self, $xhdr, $range) = @_;
+
+ if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
+ my ($ng, $n) = mid_lookup($self, $1);
+ return r430 unless $n;
+ hdr_mid_response($self, $xhdr, $ng, $n, $range, xref($ng, $n));
+ } else { # numeric range
+ $range = $self->{article} unless defined $range;
+ my $r = get_range($self, $range);
+ return $r unless ref $r;
+ my $ng = $self->{ng};
+ my $mm = $ng->mm;
+ my ($beg, $end) = @$r;
+ more($self, $xhdr ? r221 : r225);
+ $self->long_response($beg, $end, sub {
+ my ($i) = @_;
+ my $mid = $mm->mid_for($$i);
+ more($self, "$$i ".xref($ng, $$i)) if defined $mid;
+ });
+ }
+}
+
sub header_obj_for {
my ($srch, $mid) = @_;
eval {
};
};
-sub xhdr_searchmsg ($$$) {
- my ($self, $sub, $range) = @_;
- my $srch = $self->{ng}->search;
- my $emit = ($sub eq 'date') ? sub {
- my ($pfx, $m) = @_;
- my @t = gmtime($m->header('X-PI-TS'));
- more($self, "$pfx ". strftime('%a, %d %b %Y %T %z', @t));
- } : sub {
- my ($pfx, $m) = @_;
- my $h = $m->header($sub);
- more($self, "$pfx $h") if defined $h;
- };
+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]));
+ };
+ }
if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
- more($self, '221 Header follows');
- my $m = header_obj_for($srch, $1);
- $emit->($range, $m) if defined $m;
- '.';
+ 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);
+ }
} else { # numeric range
$range = $self->{article} unless defined $range;
+ my $srch = $self->{ng}->search or
+ return hdr_slow($self, $xhdr, $hdr, $range);
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);
$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;
- $emit->($$i, $m);
+ my $v = $m->header($hdr);
+ defined $v or return;
+ $v = $filter->($v) if $filter;
+ more($self, "$$i $v");
});
}
}
-sub cmd_xhdr ($$;$) {
- my ($self, $header, $range) = @_;
- my $ng = $self->{ng};
- defined $ng or return '412 no news group currently selected';
+sub do_hdr ($$$;$) {
+ my ($self, $xhdr, $header, $range) = @_;
my $sub = lc $header;
if ($sub eq 'message-id') {
- xhdr_message_id($self, $range);
- } elsif ($sub =~ /\A(subject|references|date)\z/ && $ng->search) {
- xhdr_searchmsg($self, $sub, $range);
+ hdr_message_id($self, $xhdr, $range);
+ } elsif ($sub eq 'xref') {
+ hdr_xref($self, $xhdr, $range);
+ } elsif ($sub =~ /\A(subject|references|date)\z/) {
+ hdr_searchmsg($self, $xhdr, $sub, $range);
} else {
- xhdr_slow($self, $header, $range);
+ hdr_slow($self, $xhdr, $header, $range);
}
}
-sub xhdr_slow ($$$) {
+# RFC 3977
+sub cmd_hdr ($$;$) {
my ($self, $header, $range) = @_;
+ do_hdr($self, 0, $header, $range);
+}
- if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
+# RFC 2980
+sub cmd_xhdr ($$;$) {
+ my ($self, $header, $range) = @_;
+ do_hdr($self, 1, $header, $range);
+}
+
+sub hdr_mid_prefix ($$$$$) {
+ my ($self, $xhdr, $ng, $n, $mid) = @_;
+ return $mid if $xhdr;
+
+ # HDR for RFC 3977 users
+ if (my $self_ng = $self->{ng}) {
+ ($self_ng eq $ng) ? $n : '0';
+ } else {
+ '0';
+ }
+}
+
+sub hdr_mid_response ($$$$$$) {
+ my ($self, $xhdr, $ng, $n, $mid, $v) = @_; # r: art_lookup result
+ my $res = '';
+ if ($xhdr) {
+ $res .= r221 . "\r\n";
+ $res .= "$mid $v\r\n" if defined $v;
+ } else {
+ $res .= r225 . "\r\n";
+ if (defined $v) {
+ 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;
- more($self, '221 Header follows');
- if (defined($r = xhdr($r, $header))) {
- more($self, "<$range> $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, '221 Header follows');
+ more($self, $xhdr ? r221 : r225);
$self->long_response($beg, $end, sub {
my ($i) = @_;
$r = $self->art_lookup($$i, 2);
return unless ref $r;
- defined($r = xhdr($r, $header)) or return;
+ defined($r = hdr_val($r, $header)) or return;
more($self, "$$i $r");
});
}
});
}
+sub over_line ($$) {
+ my ($self, $r) = @_;
+
+ more($self, join("\t", $r->[0], map {
+ my $h = hdr_val($r, $_);
+ defined $h ? $h : '';
+ } @OVERVIEW ));
+}
+
+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;
+ more($self, '224 Overview information follows (multi-line)');
+
+ # 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);
+ '.';
+ } else {
+ cmd_xover($self, $range);
+ }
+}
+
sub cmd_xover ($;$) {
my ($self, $range) = @_;
$range = $self->{article} unless defined $range;
my ($i) = @_;
my $r = $self->art_lookup($$i, 2);
return unless ref $r;
- more($self, join("\t", $r->[0],
- map {
- my $h = xhdr($r, $_);
- defined $h ? $h : '';
- } @OVERVIEW ));
+ over_line($self, $r);
});
}
if (MSG_MORE && !$self->{write_buf_size}) {
my $n = send($self->{sock}, $data, MSG_MORE);
if (defined $n) {
- my $dlen = bytes::length($data);
+ my $dlen = length($data);
return 1 if $n == $dlen; # all done!
- $data = bytes::substr($data, $n, $dlen - $n);
+ $data = substr($data, $n, $dlen - $n);
}
}
$self->do_write($data);
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] $line - %0.6f$d", now() - $t0);
}
return $self->close if $r < 0;
- my $len = bytes::length($self->{rbuf});
+ my $len = length($self->{rbuf});
return $self->close if ($len >= LINE_MAX);
}
$rv;
}
+sub busy () {
+ my ($self) = @_;
+ ($self->{rbuf} ne '' || $self->{long_res} || $self->{write_buf_size});
+}
+
1;