use Email::Simple;
use Data::Dumper qw(Dumper);
use POSIX qw(strftime);
-use Time::HiRes qw(gettimeofday tv_interval ualarm);
+use Time::HiRes qw(clock_gettime ualarm CLOCK_MONOTONIC);
use constant {
r501 => '501 command syntax error',
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 $err = $@;
if ($err && !$self->{closed}) {
chomp($l = Dumper(\$l));
- warning('error from: ', $l, ' ', $err);
+ err($self, "error from: $l $err");
$res = '503 program fault - command not performed';
}
return 0 unless defined $res;
sub art_lookup ($$$) {
my ($self, $art, $set_headers) = @_;
- my $ng = $self->{ng} or return '412 no newsgroup has been selected';
+ my $ng = $self->{ng};
my ($n, $mid);
my $err;
if (defined $art) {
$n = int($art);
goto find_mid;
} elsif ($art =~ /\A<([^>]+)>\z/) {
- $err = '430 no such article found';
$mid = $1;
- $n = $ng->mm->num_for($mid);
- defined $mid or return $err;
+ $err = '430 no such article found';
+ $n = $ng->mm->num_for($mid) if $ng;
+ goto found if defined $n;
+ foreach my $g (values %{$self->{nntpd}->{groups}}) {
+ $n = $g->mm->num_for($mid);
+ if (defined $n) {
+ $ng = $g;
+ goto found;
+ }
+ }
+ return $err;
} else {
return r501;
}
$n = $self->{article};
defined $n or return $err;
find_mid:
+ $ng or return '412 no newsgroup has been selected';
$mid = $ng->mm->mid_for($n);
defined $mid or return $err;
}
-
+found:
my $o = 'HEAD:' . mid2path($mid);
my $s = eval { Email::Simple->new($ng->gcf->cat_file($o)) };
return $err unless $s;
$h->as_string
}
-sub cmd_article ($$) {
+sub set_art {
+ my ($self, $art) = @_;
+ $self->{article} = $art if defined $art && $art =~ /\A\d+\z/;
+}
+
+sub cmd_article ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 1);
return $r unless ref $r;
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, "\r\n");
simple_body_write($self, $s);
}
-sub cmd_head ($$) {
+sub cmd_head ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 2);
return $r unless ref $r;
my ($n, $mid, $s) = @$r;
+ set_art($self, $art);
more($self, "221 $n <$mid> article retrieved - head follows");
do_more($self, header_str($s));
'.'
}
-sub cmd_body ($$) {
+sub cmd_body ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 0);
return $r unless ref $r;
my ($n, $mid, $s) = @$r;
+ set_art($self, $art);
more($self, "222 $n <$mid> article retrieved - body follows");
simple_body_write($self, $s);
}
-sub cmd_stat ($$) {
+sub cmd_stat ($;$) {
my ($self, $art) = @_;
my $r = $self->art_lookup($art, 0);
return $r unless ref $r;
my ($n, $mid, undef) = @$r;
+ set_art($self, $art);
"223 $n <$mid> article retrieved - request text separately";
}
# 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:
if ($err || $self->{closed}) {
$self->{long_res} = undef;
- warning("$err during long response") if $err;
- $self->watch_read(1) unless $self->{closed};
+
+ if ($err) {
+ err($self,
+ "$err during long response[$fd] - %0.6f",
+ now() - $t0);
+ }
+ if ($self->{closed}) {
+ out($self, " deferred[$fd] aborted - %0.6f",
+ now() - $t0);
+ } else {
+ $self->watch_read(1);
+ }
} elsif ($yield || $self->{write_buf_size}) {
# no recursion, schedule another call ASAP
# but only after all pending writes are done
$self->{long_res} = undef;
$self->watch_read(1);
res($self, '.');
+ out($self, " deferred[$fd] done - %0.6f", now() - $t0);
}
};
$self->{long_res}->(); # kick off!
undef;
}
+sub xhdr_message_id ($$) { # optimize XHDR Message-ID [range] for slrnpull.
+ my ($self, $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;
+ '.';
+ } 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');
+ $self->long_response($beg, $end, sub {
+ my ($i) = @_;
+ my $mid = $mm->mid_for($$i);
+ more($self, "$$i <$mid>") if defined $mid;
+ });
+ }
+}
+
+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 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;
+ };
+
+ 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;
+ '.';
+ } else { # numeric range
+ $range = $self->{article} unless defined $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');
+ $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);
+ });
+ }
+}
+
sub cmd_xhdr ($$;$) {
my ($self, $header, $range) = @_;
- defined $self->{ng} or return '412 no news group currently selected';
+ my $ng = $self->{ng};
+ defined $ng or return '412 no news group currently selected';
+ 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);
+ } else {
+ xhdr_slow($self, $header, $range);
+ }
+}
+
+sub xhdr_slow ($$$) {
+ my ($self, $header, $range) = @_;
+
if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
my $r = $self->art_lookup($range, 2);
return $r unless ref $r;
}
}
+sub cmd_xrover ($;$) {
+ my ($self, $range) = @_;
+ my $ng = $self->{ng} or return '412 no newsgroup selected';
+ (defined $range && $range =~ /[<>]/) and
+ return '420 No article(s) selected'; # no message IDs
+
+ $range = $self->{article} unless defined $range;
+ my $r = get_range($self, $range);
+ return $r unless ref $r;
+ my ($beg, $end) = @$r;
+ my $mm = $ng->mm;
+ my $srch = $ng->search;
+ more($self, '224 Overview information follows');
+ $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;
+ });
+}
+
sub cmd_xover ($;$) {
my ($self, $range) = @_;
$range = $self->{article} unless defined $range;
});
}
+sub cmd_xpath ($$) {
+ my ($self, $mid) = @_;
+ return r501 unless $mid =~ /\A<(.+)>\z/;
+ $mid = $1;
+ my @paths;
+ foreach my $ng (values %{$self->{nntpd}->{groups}}) {
+ my $n = $ng->mm->num_for($mid);
+ push @paths, "$ng->{name}/$n" if defined $n;
+ }
+ return '430 no such article on server' unless @paths;
+ '223 '.join(' ', @paths);
+}
+
sub res ($$) {
my ($self, $line) = @_;
do_write($self, $line . "\r\n");
$done;
}
+sub err ($$;@) {
+ my ($self, $fmt, @args) = @_;
+ printf { $self->{nntpd}->{err} } $fmt."\n", @args;
+}
+
+sub out ($$;@) {
+ my ($self, $fmt, @args) = @_;
+ printf { $self->{nntpd}->{out} } $fmt."\n", @args;
+}
+
use constant MSG_MORE => ($^O eq 'linux') ? 0x8000 : 0;
sub do_more ($$) {
sub event_write {
my ($self) = @_;
# only continue watching for readability when we are done writing:
- $self->write(undef) == 1 and $self->watch_read(1);
+ if ($self->write(undef) == 1 && !$self->{long_res}) {
+ $self->watch_read(1);
+ }
}
sub event_read {
use constant LINE_MAX => 512; # RFC 977 section 2.3
my $r = 1;
my $buf = $self->read(LINE_MAX) or return $self->close;
- while ($r > 0 && $$buf =~ s/\A([^\r\n]+)\r?\n//) {
+ while ($r > 0 && $$buf =~ s/\A\s*([^\r\n]+)\r?\n//) {
my $line = $1;
- my $t0 = [ gettimeofday ];
+ my $t0 = now();
$r = eval { $self->process_line($line) };
- printf(STDERR "$line %0.6f\n",
- tv_interval($t0, [gettimeofday]));
+ my $d = $self->{long_res} ?
+ ' deferred['.fileno($self->{sock}).']' : '';
+ out($self, "$line - %0.6f$d", now() - $t0);
}
return $self->close if $r < 0;
my $len = bytes::length($$buf);
$self->push_back_read($buf) if ($len);
}
-sub warning { print STDERR @_, "\n" }
-
1;