X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=d1f75f6fc07a17e942d0c372fb114d63d8a40ac3;hb=150acb76fe824283ee41dcccc263eb38195d7ebd;hp=95c9082d807dcc8d16a19ac885fda0b223b87dac;hpb=57c2bb80e2f94dfcbf08532f72c7ed568ceef7be;p=public-inbox.git diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index 95c9082d..d1f75f6f 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2019 all contributors +# Copyright (C) 2015-2020 all contributors # License: AGPL-3.0+ # # Each instance of this represents a NNTP client socket @@ -7,7 +7,7 @@ use strict; use warnings; use base qw(PublicInbox::DS); use fields qw(nntpd article ng long_cb); -use PublicInbox::MID qw(mid_escape); +use PublicInbox::MID qw(mid_escape $MID_EXTRACT); use Email::Simple; use POSIX qw(strftime); use PublicInbox::DS qw(now); @@ -24,7 +24,7 @@ use constant { }; use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT); use Errno qw(EAGAIN); - +my $ONE_MSGID = qr/\A$MID_EXTRACT\z/; my @OVERVIEW = qw(Subject From Date Message-ID References); my $OVERVIEW_FMT = join(":\r\n", @OVERVIEW, qw(Bytes Lines), '') . "Xref:full\r\n"; @@ -76,7 +76,7 @@ sub args_ok ($$) { # returns 1 if we can continue, 0 if not due to buffered writes or disconnect sub process_line ($$) { my ($self, $l) = @_; - my ($req, @args) = split(/[ \t]/, $l); + my ($req, @args) = split(/[ \t]+/, $l); return 1 unless defined($req); # skip blank line $req = $self->can('cmd_'.lc($req)); return res($self, '500 command not recognized') unless $req; @@ -423,10 +423,7 @@ sub set_nntp_headers ($$$$$) { $hdr->header_set('Message-ID', $mid0); my @alt = $hdr->header('X-Alt-Message-ID'); my %seen = map { $_ => 1 } (@alt, $mid0); - foreach my $m (@mids) { - next if $seen{$m}++; - push @alt, $m; - } + push(@alt, grep { !$seen{$_}++ } @mids); $hdr->header_set('X-Alt-Message-ID', @alt); } @@ -453,7 +450,7 @@ sub art_lookup ($$$) { $err = '423 no such article number in this group'; $n = int($art); goto find_mid; - } elsif ($art =~ /\A<([^>]+)>\z/) { + } elsif ($art =~ $ONE_MSGID) { $mid = $1; $err = r430; $n = $ng->mm->num_for($mid) if $ng; @@ -596,12 +593,11 @@ sub get_range ($$) { sub long_step { my ($self) = @_; # wbuf is unset or empty, here; {long} may add to it - my ($cb, $t0, @args) = @{$self->{long_cb}}; + my ($fd, $cb, $t0, @args) = @{$self->{long_cb}}; my $more = eval { $cb->($self, @args) }; if ($@ || !$self->{sock}) { # something bad happened... delete $self->{long_cb}; my $elapsed = now() - $t0; - my $fd = fileno($self->{sock}); if ($@) { err($self, "%s during long response[$fd] - %0.6f", @@ -617,20 +613,19 @@ sub long_step { # each other's data $self->zflush; - # no recursion, schedule another call ASAP - # but only after all pending writes are done - my $wbuf = $self->{wbuf} ||= []; - push @$wbuf, \&long_step; + # no recursion, schedule another call ASAP, but only after + # all pending writes are done. autovivify wbuf: + my $new_size = push(@{$self->{wbuf}}, \&long_step); # wbuf may be populated by $cb, no need to rearm if so: - $self->requeue if scalar(@$wbuf) == 1; + $self->requeue if $new_size == 1; } else { # all done! delete $self->{long_cb}; res($self, '.'); my $elapsed = now() - $t0; my $fd = fileno($self->{sock}); out($self, " deferred[$fd] done - %0.6f", $elapsed); - my $wbuf = $self->{wbuf}; + my $wbuf = $self->{wbuf}; # do NOT autovivify $self->requeue unless $wbuf && @$wbuf; } } @@ -638,11 +633,11 @@ sub long_step { sub long_response ($$;@) { my ($self, $cb, @args) = @_; # cb returns true if more, false if done - $self->{sock} or return; + my $sock = $self->{sock} 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->{long_cb} = [ $cb, now(), @args ]; + $self->{long_cb} = [ fileno($sock), $cb, now(), @args ]; long_step($self); # kick off! undef; } @@ -658,7 +653,7 @@ sub hdr_msgid_range_i { sub hdr_message_id ($$$) { # optimize XHDR Message-ID [range] for slrnpull. my ($self, $xhdr, $range) = @_; - if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID + if (defined $range && $range =~ $ONE_MSGID) { my ($ng, $n) = mid_lookup($self, $1); return r430 unless $n; hdr_mid_response($self, $xhdr, $ng, $n, $range, $range); @@ -701,7 +696,7 @@ sub xref_range_i { sub hdr_xref ($$$) { # optimize XHDR Xref [range] for rtin my ($self, $xhdr, $range) = @_; - if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID + if (defined $range && $range =~ $ONE_MSGID) { my $mid = $1; my ($ng, $n) = mid_lookup($self, $mid); return r430 unless $n; @@ -719,11 +714,11 @@ sub hdr_xref ($$$) { # optimize XHDR Xref [range] for rtin sub over_header_for { my ($over, $num, $field) = @_; my $smsg = $over->get_art($num) or return; - return PublicInbox::SearchMsg::date($smsg) if $field eq 'date'; + return PublicInbox::Smsg::date($smsg) if $field eq 'date'; $smsg->{$field}; } -sub searchmsg_range_i { +sub smsg_range_i { my ($self, $beg, $end, $field) = @_; my $over = $self->{ng}->over; my $msgs = $over->query_xover($$beg, $end); @@ -737,9 +732,9 @@ sub searchmsg_range_i { $$beg = $msgs->[-1]->{num} + 1; } -sub hdr_searchmsg ($$$$) { +sub hdr_smsg ($$$$) { my ($self, $xhdr, $field, $range) = @_; - if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID + if (defined $range && $range =~ $ONE_MSGID) { my ($ng, $n) = mid_lookup($self, $1); return r430 unless defined $n; my $v = over_header_for($ng->over, $n, $field); @@ -749,7 +744,7 @@ sub hdr_searchmsg ($$$$) { my $r = get_range($self, $range); return $r unless ref $r; more($self, $xhdr ? r221 : r225); - long_response($self, \&searchmsg_range_i, @$r, $field); + long_response($self, \&smsg_range_i, @$r, $field); } } @@ -762,9 +757,9 @@ sub do_hdr ($$$;$) { hdr_xref($self, $xhdr, $range); } elsif ($sub =~ /\A(?:subject|references|date|from|to|cc| bytes|lines)\z/x) { - hdr_searchmsg($self, $xhdr, $sub, $range); + hdr_smsg($self, $xhdr, $sub, $range); } elsif ($sub =~ /\A:(bytes|lines)\z/) { - hdr_searchmsg($self, $xhdr, $1, $range); + hdr_smsg($self, $xhdr, $1, $range); } else { $xhdr ? (r221 . "\r\n.") : "503 HDR not permitted on $header"; } @@ -836,7 +831,7 @@ sub over_line ($$$$) { my $s = join("\t", $num, $smsg->{subject}, $smsg->{from}, - PublicInbox::SearchMsg::date($smsg), + PublicInbox::Smsg::date($smsg), "<$smsg->{mid}>", $smsg->{references}, $smsg->{bytes}, @@ -848,7 +843,7 @@ sub over_line ($$$$) { sub cmd_over ($;$) { my ($self, $range) = @_; - if ($range && $range =~ /\A<(.+)>\z/) { + if ($range && $range =~ $ONE_MSGID) { my ($ng, $n) = mid_lookup($self, $1); defined $n or return r430; my $smsg = $ng->over->get_art($n) or return r430; @@ -916,7 +911,7 @@ sub zflush {} # overridden by NNTPdeflate sub cmd_xpath ($$) { my ($self, $mid) = @_; - return r501 unless $mid =~ /\A<(.+)>\z/; + return r501 unless $mid =~ $ONE_MSGID; $mid = $1; my @paths; foreach my $ng (values %{$self->{nntpd}->{groups}}) {