No ext_urls

[public-inbox.git] / lib / PublicInbox / NNTP.pm

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index b223eb07d417bad27115bcf5411090f4e9ab257c..7a91e7ebfe49d158080d3a3bbabc0c630b5997da 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -15,7 +15,7 @@ use PublicInbox::MID qw(mid_escape $MID_EXTRACT);
 use PublicInbox::Eml;
 use POSIX qw(strftime);
 use PublicInbox::DS qw(now);
-use Digest::SHA qw(sha1_hex);
+use PublicInbox::SHA qw(sha1_hex);
 use Time::Local qw(timegm timelocal);
 use PublicInbox::GitAsyncCat;
 use PublicInbox::Address;
@@ -72,9 +72,8 @@ sub process_line ($$) {
        my $res = eval { $req->($self, @args) };
        my $err = $@;
        if ($err && $self->{sock}) {
-               local $/ = "\n";
-               chomp($l);
-               err($self, 'error from: %s (%s)', $l, $err);
+               $l =~ s/\r?\n//s;
+               warn("error from: $l ($err)\n");
                $res = \"503 program fault - command not performed\r\n";
        }
        defined($res) ? $self->write($res) : 0;
@@ -85,7 +84,7 @@ sub cmd_capabilities ($;$) {
        my ($self, undef) = @_;
        my $res = $CAPABILITIES;
        if (!$self->{sock}->can('accept_SSL') &&
-                       $self->{nntpd}->{accept_tls}) {
+                       $self->{nntpd}->{ssl_ctx_opt}) {
                $res .= "STARTTLS\r\n";
        }
        $res .= ".\r\n";
@@ -123,7 +122,7 @@ sub names2ibx ($;$) {
 sub list_active_i { # "LIST ACTIVE" and also just "LIST" (no args)
        my ($self, $ibxs) = @_;
        my @window = splice(@$ibxs, 0, 1000);
-       $self->msg_more(join('', map { group_line($_) } @window));
+       emit_group_lines($self, \@window);
        scalar @$ibxs; # continue if there's more
 }
 
@@ -189,7 +188,7 @@ sub listgroup_range_i {
        my ($self, $beg, $end) = @_;
        my $r = $self->{ibx}->mm(1)->msg_range($beg, $end, 'num');
        scalar(@$r) or return;
-       $self->msg_more(join("\r\n", @$r, ''));
+       $self->msg_more(join('', map { "$_->[0]\r\n" } @$r));
        1;
 }
 
@@ -244,19 +243,27 @@ sub parse_time ($$;$) {
        }
 }
 
-sub group_line ($) {
-       my ($ibx) = @_;
-       my ($min, $max) = $ibx->mm(1)->minmax;
-       "$ibx->{newsgroup} $max $min n\r\n";
+sub emit_group_lines {
+       my ($self, $ibxs) = @_;
+       my ($min, $max);
+       my $ALL = $self->{nntpd}->{pi_cfg}->ALL;
+       my $misc = $ALL->misc if $ALL;
+       my $buf = '';
+       for my $ibx (@$ibxs) {
+               $misc ? $misc->inbox_data($ibx) :
+                       delete(@$ibx{qw(-art_min -art_max)});
+               ($min, $max) = ($ibx->art_min, $ibx->art_max);
+               $buf .= "$ibx->{newsgroup} $max $min n\r\n";
+       }
+       $self->msg_more($buf);
 }
 
 sub newgroups_i {
        my ($self, $ts, $ibxs) = @_;
        my @window = splice(@$ibxs, 0, 1000);
-       $self->msg_more(join('', map { group_line($_) } grep {
-                (eval { $_->uidvalidity } // 0) > $ts
-       } @window));
-       scalar @$ibxs;
+       @window = grep { (eval { $_->uidvalidity } // 0) > $ts } @window;
+       emit_group_lines($self, \@window);
+       scalar @$ibxs; # any more?
 }
 
 sub cmd_newgroups ($$$;$$) {
@@ -556,7 +563,7 @@ sub blob_cb { # called by git->cat_async via ibx_async_cat
                $self->close;
                die "BUG: bad code: $r";
        }
-       $self->write(\".\r\n"); # flushes (includes ->zflush)
+       $self->write(\".\r\n"); # flushes (includes ->dflush)
        $self->requeue;
 }
 
@@ -885,13 +892,13 @@ sub cmd_xover ($;$) {
 
 sub cmd_starttls ($) {
        my ($self) = @_;
-       my $sock = $self->{sock} or return;
        # RFC 4642 2.2.1
-       return r502 if ($sock->can('accept_SSL') || $self->compressed);
-       my $opt = $self->{nntpd}->{accept_tls} or
+       (($self->{sock} // return)->can('stop_SSL') || $self->compressed) and
+               return r502;
+       $self->{nntpd}->{ssl_ctx_opt} or
                return \"580 can not initiate TLS negotiation\r\n";
        $self->write(\"382 Continue with TLS negotiation\r\n");
-       $self->{sock} = IO::Socket::SSL->start_SSL($sock, %$opt);
+       PublicInbox::TLS::start($self->{sock}, $self->{nntpd});
        $self->requeue if PublicInbox::DS::accept_tls_step($self);
        undef;
 }
@@ -937,11 +944,6 @@ sub cmd_xpath ($$) {
        '223 '.join(' ', sort(@paths))."\r\n";
 }
 
-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;
@@ -950,7 +952,7 @@ sub out ($$;@) {
 # callback used by PublicInbox::DS for any (e)poll (in/out/hup/err)
 sub event_step {
        my ($self) = @_;
-
+       local $SIG{__WARN__} = $self->{nntpd}->{warn_cb};
        return unless $self->flush_write && $self->{sock} && !$self->{long_cb};
 
        # only read more requests if we've drained the write buffer,