diff options
Diffstat (limited to 'lib/PublicInbox/IMAPD.pm')
| -rw-r--r-- | lib/PublicInbox/IMAPD.pm | 148 |
1 files changed, 59 insertions, 89 deletions
diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 661d6537..42dc2a9f 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -1,122 +1,85 @@ # Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -# represents an IMAPD (currently a singleton), -# see script/public-inbox-imapd for how it is used +# represents an IMAPD, see script/public-inbox-imapd for how it is used package PublicInbox::IMAPD; use strict; use v5.10.1; use PublicInbox::Config; -use PublicInbox::ConfigIter; use PublicInbox::InboxIdle; -use PublicInbox::IMAPdeflate; # loads PublicInbox::IMAP +use PublicInbox::IMAP; use PublicInbox::DummyInbox; my $dummy = bless { uidvalidity => 0 }, 'PublicInbox::DummyInbox'; sub new { my ($class) = @_; bless { - mailboxes => {}, + # mailboxes => {}, err => \*STDERR, out => \*STDOUT, - # accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... } + # ssl_ctx_opt => { SSL_cert_file => ..., SSL_key_file => ... } # pi_cfg => PublicInbox::Config # idler => PublicInbox::InboxIdle }, $class; } -sub imapd_refresh_ibx { # pi_cfg->each_inbox cb - my ($ibx, $imapd) = @_; - my $ngname = $ibx->{newsgroup} or return; +sub _refresh_ibx { # pi_cfg->each_inbox cb + my ($ibx, $imapd, $cache, $dummies) = @_; + my $ngname = $ibx->{newsgroup} // return; - # We require lower-case since IMAP mailbox names are - # case-insensitive (but -nntpd matches INN in being - # case-sensitive - if ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! || - # don't confuse with 50K slices - $ngname =~ /\.[0-9]+\z/) { - warn "mailbox name invalid: newsgroup=`$ngname'\n"; + if ($ngname =~ /\.[0-9]+\z/) { # don't confuse with 50K slices + warn "E: mailbox name invalid: newsgroup=`$ngname' (ignored)\n"; return; } - $ibx->over or return; - $ibx->{over} = undef; - - # RFC 3501 2.3.1.1 - "A good UIDVALIDITY value to use in - # this case is a 32-bit representation of the creation - # date/time of the mailbox" - eval { $ibx->uidvalidity }; - my $mm = delete($ibx->{mm}) or return; - defined($ibx->{uidvalidity}) or return; - PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx, $mm->max); - - # preload to avoid fragmentation: - $ibx->description; - $ibx->base_url; - - # ensure dummies are selectable - my $dummies = $imapd->{dummies}; - do { - $dummies->{$ngname} = $dummy; - } while ($ngname =~ s/\.[^\.]+\z//); -} - -sub imapd_refresh_finalize { - my ($imapd, $pi_cfg) = @_; - my $mailboxes; - if (my $next = delete $imapd->{imapd_next}) { - $imapd->{mailboxes} = delete $next->{mailboxes}; - $mailboxes = delete $next->{dummies}; - } else { - $mailboxes = delete $imapd->{dummies}; - } - %$mailboxes = (%$mailboxes, %{$imapd->{mailboxes}}); - $imapd->{mailboxes} = $mailboxes; - $imapd->{mailboxlist} = [ - map { $_->[2] } - sort { $a->[0] cmp $b->[0] || $a->[1] <=> $b->[1] } - map { - my $u = $_; # capitalize "INBOX" for user-familiarity - $u =~ s/\Ainbox(\.|\z)/INBOX$1/i; - if ($mailboxes->{$_} == $dummy) { - [ $u, -1, - qq[* LIST (\\HasChildren) "." $u\r\n]] - } else { - $u =~ /\A(.+)\.([0-9]+)\z/ or - die "BUG: `$u' has no slice digit(s)"; - [ $1, $2 + 0, - qq[* LIST (\\HasNoChildren) "." $u\r\n] ] - } - } keys %$mailboxes - ]; - $imapd->{pi_cfg} = $pi_cfg; - if (my $idler = $imapd->{idler}) { - $idler->refresh($pi_cfg); - } -} - -sub imapd_refresh_step { # pi_cfg->iterate_start cb - my ($pi_cfg, $section, $imapd) = @_; - if (defined($section)) { - return if $section !~ m!\Apublicinbox\.([^/]+)\z!; - my $ibx = $pi_cfg->lookup_name($1) or return; - imapd_refresh_ibx($ibx, $imapd->{imapd_next}); - } else { # undef == "EOF" - imapd_refresh_finalize($imapd, $pi_cfg); + my $ce = $cache->{$ngname}; + %$ibx = (%$ibx, %$ce) if $ce; + # only valid if msgmap and over works: + if (defined($ibx->uidvalidity)) { + # fill ->{mailboxes}: + PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx); + # preload to avoid fragmentation: + $ibx->description; + # ensure dummies are selectable: + do { + $dummies->{$ngname} = $dummy; + } while ($ngname =~ s/\.[^\.]+\z//); } + delete @$ibx{qw(mm over)}; } sub refresh_groups { my ($self, $sig) = @_; my $pi_cfg = PublicInbox::Config->new; - if ($sig) { # SIGHUP is handled through the event loop - $self->{imapd_next} = { dummies => {}, mailboxes => {} }; - my $iter = PublicInbox::ConfigIter->new($pi_cfg, - \&imapd_refresh_step, $self); - $iter->event_step; - } else { # initial start is synchronous - $self->{dummies} = {}; - $pi_cfg->each_inbox(\&imapd_refresh_ibx, $self); - imapd_refresh_finalize($self, $pi_cfg); + require PublicInbox::IMAPsearchqp; + $self->{mailboxes} = $pi_cfg->{-imap_mailboxes} // do { + my $mailboxes = $self->{mailboxes} = {}; + my $cache = eval { $pi_cfg->ALL->misc->nntpd_cache_load } // {}; + my $dummies = {}; + $pi_cfg->each_inbox(\&_refresh_ibx, $self, $cache, $dummies); + %$mailboxes = (%$dummies, %$mailboxes); + @{$pi_cfg->{-imap_mailboxlist}} = map { $_->[2] } + sort { $a->[0] cmp $b->[0] || $a->[1] <=> $b->[1] } + map { + # capitalize "INBOX" for user-familiarity + my $u = $_; + $u =~ s/\Ainbox(\.|\z)/INBOX$1/i; + if ($mailboxes->{$_} == $dummy) { + [ $u, -1, + qq[* LIST (\\HasChildren) "." $u\r\n]] + } else { + $u =~ /\A(.+)\.([0-9]+)\z/ or die +"BUG: `$u' has no slice digit(s)"; + [ $1, $2 + 0, '* LIST '. + qq[(\\HasNoChildren) "." $u\r\n] ] + } + } keys %$mailboxes; + $pi_cfg->{-imap_mailboxes} = $mailboxes; + }; + $self->{mailboxlist} = $pi_cfg->{-imap_mailboxlist} // + die 'BUG: no mailboxlist'; + $self->{pi_cfg} = $pi_cfg; + if (my $idler = $self->{idler}) { + $idler->refresh($pi_cfg); } } @@ -124,4 +87,11 @@ sub idler_start { $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_cfg}); } +sub event_step { # called vai requeue for low-priority IMAP clients + my ($self) = @_; + my $imap = shift(@{$self->{-authed_q}}) // return; + PublicInbox::DS::requeue($self) if scalar(@{$self->{-authed_q}}); + $imap->event_step; # PublicInbox::IMAP::event_step +} + 1; |