imap: support out-of-bounds ranges

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

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index 917833f7c470bfc1c6d573f6dc165b277af4b1db..ffa76bb0266a0534b27e85c4f212e111cc611bdd 100644 (file)
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -388,7 +388,7 @@ sub requeue_once ($) {
        $self->requeue if $new_size == 1;
 }
 
-sub uid_fetch_cb { # called by git->cat_async via git_async_msg
+sub uid_fetch_cb { # called by git->cat_async via git_async_cat
        my ($bref, $oid, $type, $size, $fetch_m_arg) = @_;
        my ($self, undef, $ibx, $msgs, undef, $want) = @$fetch_m_arg;
        my $smsg = shift @$msgs or die 'BUG: no smsg';
@@ -400,6 +400,7 @@ sub uid_fetch_cb { # called by git->cat_async via git_async_msg
        } else {
                $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
        }
+
        $$bref =~ s/(?<!\r)\n/\r\n/sg; # make strict clients happy
 
        # fixup old bug from import (pre-a0c07cba0e5d8b6a)
@@ -454,11 +455,13 @@ sub range_step ($$) {
                $$range_csv = undef;
        }
        if ($range =~ /\A([0-9]+):([0-9]+)\z/) {
-               ($beg, $end) = ($1, $2);
+               ($beg, $end) = ($1 + 0, $2 + 0);
        } elsif ($range =~ /\A([0-9]+):\*\z/) {
-               ($beg, $end) =  ($1, $ibx->mm->max // 0);
+               $beg = $1 + 0;
+               $end = $ibx->mm->max // 0;
+               $beg = $end if $beg > $end;
        } elsif ($range =~ /\A[0-9]+\z/) {
-               $beg = $end = $range;
+               $beg = $end = $range + 0;
        } else {
                return 'BAD fetch range';
        }
@@ -487,7 +490,7 @@ sub uid_fetch_m { # long_response
                        return;
                }
        }
-       git_async_msg($ibx, $msgs->[0], \&uid_fetch_cb, \@_);
+       git_async_cat($ibx->git, $msgs->[0]->{blob}, \&uid_fetch_cb, \@_);
 }
 
 sub cmd_status ($$$;@) {
@@ -719,7 +722,8 @@ sub seq_fetch_m { # long_response
        my $seq = $want->{-seqno}++;
        my $cur_num = $msgs->[0]->{num};
        if ($cur_num == $seq) { # as expected
-               git_async_msg($ibx, $msgs->[0], \&uid_fetch_cb, \@_);
+               git_async_cat($ibx->git, $msgs->[0]->{blob},
+                               \&uid_fetch_cb, \@_);
        } elsif ($cur_num > $seq) {
                # send dummy messages until $seq catches up to $cur_num
                my $smsg = bless { num => $seq, ts => 0 }, 'PublicInbox::Smsg';
@@ -888,38 +892,35 @@ sub long_response ($$;@) {
 sub event_step {
        my ($self) = @_;
 
-       return unless $self->flush_write && $self->{sock};
+       return unless $self->flush_write && $self->{sock} && !$self->{long_cb};
 
        $self->update_idle_time;
        # only read more requests if we've drained the write buffer,
        # otherwise we can be buffering infinitely w/o backpressure
 
-       my $rbuf = $self->{rbuf} // (\(my $x = ''));
-       my $r = 1;
-
-       if (index($$rbuf, "\n") < 0) {
-               my $off = length($$rbuf);
-               $r = $self->do_read($rbuf, LINE_MAX, $off) or return;
-       }
-       while ($r > 0 && $$rbuf =~ s/\A[ \t]*([^\n]*?)\r?\n//) {
-               my $line = $1;
-               return $self->close if $line =~ /[[:cntrl:]]/s;
-               my $t0 = now();
-               my $fd = fileno($self->{sock});
-               $r = eval { process_line($self, $line) };
-               my $pending = $self->{wbuf} ? ' pending' : '';
-               out($self, "[$fd] %s - %0.6f$pending", $line, now() - $t0);
-       }
+       my $rbuf = $self->{rbuf} // \(my $x = '');
+       my $line = index($$rbuf, "\n");
+       while ($line < 0) {
+               return $self->close if length($$rbuf) >= LINE_MAX;
+               $self->do_read($rbuf, LINE_MAX, length($$rbuf)) or return;
+               $line = index($$rbuf, "\n");
+       }
+       $line = substr($$rbuf, 0, $line + 1, '');
+       $line =~ s/\r?\n\z//s;
+       return $self->close if $line =~ /[[:cntrl:]]/s;
+       my $t0 = now();
+       my $fd = fileno($self->{sock});
+       my $r = eval { process_line($self, $line) };
+       my $pending = $self->{wbuf} ? ' pending' : '';
+       out($self, "[$fd] %s - %0.6f$pending - $r", $line, now() - $t0);
 
        return $self->close if $r < 0;
-       my $len = length($$rbuf);
-       return $self->close if ($len >= LINE_MAX);
        $self->rbuf_idle($rbuf);
        $self->update_idle_time;
 
        # maybe there's more pipelined data, or we'll have
        # to register it for socket-readiness notifications
-       $self->requeue unless $self->{wbuf};
+       $self->requeue unless $pending;
 }
 
 sub compressed { undef }