update copyrights for 2021

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

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index 2d0d005e6f8b71239a342669a03645c0600f82ef..68a7e050a27f8928cd58711a0f612bbd131c2b3b 100644 (file)
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Each instance of this represents an IMAP client connected to
@@ -115,7 +115,7 @@ sub new ($$$) {
        my $wbuf;
        if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
                return CORE::close($sock) if $! != EAGAIN;
-               $ev = PublicInbox::TLS::epollbit();
+               $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
                $wbuf = [ \&PublicInbox::DS::accept_tls_step, \&greet ];
        }
        $self->SUPER::new($sock, $ev | EPOLLONESHOT);
@@ -300,7 +300,7 @@ sub msn2uid ($) {
 # converts a set of message sequence numbers in requests to UIDs:
 sub msn_to_uid_range ($$) {
        my $msn2uid = $_[0];
-       $_[1] =~ s!([0-9]+)!$msn2uid->[$1 - 1] // ($msn2uid->[-1] + 1)!sge;
+       $_[1] =~ s!([0-9]+)!$msn2uid->[$1 - 1] // ($msn2uid->[-1] // 0 + 1)!sge;
 }
 
 # called by PublicInbox::InboxIdle
@@ -615,18 +615,19 @@ sub fetch_run_ops {
 sub fetch_blob_cb { # called by git->cat_async via git_async_cat
        my ($bref, $oid, $type, $size, $fetch_arg) = @_;
        my ($self, undef, $msgs, $range_info, $ops, $partial) = @$fetch_arg;
+       my $ibx = $self->{ibx} or return $self->close; # client disconnected
        my $smsg = shift @$msgs or die 'BUG: no smsg';
        if (!defined($oid)) {
                # it's possible to have TOCTOU if an admin runs
                # public-inbox-(edit|purge), just move onto the next message
-               warn "E: $smsg->{blob} missing in $self->{ibx}->{inboxdir}\n";
+               warn "E: $smsg->{blob} missing in $ibx->{inboxdir}\n";
                return requeue_once($self);
        } else {
                $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
        }
        my $pre;
        if (!$self->{wbuf} && (my $nxt = $msgs->[0])) {
-               $pre = $self->{ibx}->git->async_prefetch($nxt->{blob},
+               $pre = git_async_prefetch($ibx->git, $nxt->{blob},
                                                \&fetch_blob_cb, $fetch_arg);
        }
        fetch_run_ops($self, $smsg, $bref, $ops, $partial);
@@ -1109,7 +1110,7 @@ sub search_uid_range { # long_response
        1; # more
 }
 
-sub parse_query ($$) {
+sub parse_imap_query ($$) {
        my ($self, $query) = @_;
        my $q = PublicInbox::IMAPsearchqp::parse($self, $query);
        if (ref($q)) {
@@ -1121,37 +1122,10 @@ sub parse_query ($$) {
        $q;
 }
 
-sub refill_xap ($$$$) {
-       my ($self, $uids, $range_info, $q) = @_;
-       my ($beg, $end) = @$range_info;
-       my $srch = $self->{ibx}->search;
-       my $opt = { mset => 2, limit => 1000 };
-       my $mset = $srch->mset("$q uid:$beg..$end", $opt);
-       @$uids = @{$srch->mset_to_artnums($mset)};
-       if (@$uids) {
-               $range_info->[0] = $uids->[-1] + 1; # update $beg
-               return; # possibly more
-       }
-       0; # all done
-}
-
-sub search_xap_range { # long_response
-       my ($self, $tag, $q, $range_info, $want_msn) = @_;
-       my $uids = [];
-       if (defined(my $err = refill_xap($self, $uids, $range_info, $q))) {
-               $err ||= 'OK Search done';
-               $self->write("\r\n$tag $err\r\n");
-               return;
-       }
-       msn_convert($self, $uids) if $want_msn;
-       $self->msg_more(join(' ', '', @$uids));
-       1; # more
-}
-
 sub search_common {
        my ($self, $tag, $query, $want_msn) = @_;
        my $ibx = $self->{ibx} or return "$tag BAD No mailbox selected\r\n";
-       my $q = parse_query($self, $query);
+       my $q = parse_imap_query($self, $query);
        return "$tag $q\r\n" if !ref($q);
        my ($sql, $range_info) = delete @$q{qw(sql range_info)};
        if (!scalar(keys %$q)) { # overview.sqlite3
@@ -1159,11 +1133,17 @@ sub search_common {
                long_response($self, \&search_uid_range,
                                $tag, $sql, $range_info, $want_msn);
        } elsif ($q = $q->{xap}) {
-               $self->{ibx}->search or
+               my $srch = $self->{ibx}->isrch or
                        return "$tag BAD search not available for mailbox\r\n";
-               $self->msg_more('* SEARCH');
-               long_response($self, \&search_xap_range,
-                               $tag, $q, $range_info, $want_msn);
+               my $opt = {
+                       relevance => -1,
+                       limit => UID_SLICE,
+                       uid_range => $range_info
+               };
+               my $mset = $srch->mset($q, $opt);
+               my $uids = $srch->mset_to_artnums($mset, $opt);
+               msn_convert($self, $uids) if $want_msn;
+               "* SEARCH @$uids\r\n$tag OK Search done\r\n";
        } else {
                "$tag BAD Error\r\n";
        }