* [PATCH 43/82] imap: require ".$UID_MIN-$UID_END" suffix
2020-06-10 7:03 7% [PATCH 00/82] public-inbox-imapd: read-only IMAP server Eric Wong
@ 2020-06-10 7:04 3% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-06-10 7:04 UTC (permalink / raw)
To: meta
Finish up the IMAP-only portion of iterative config reloading,
which allows us to create all sub-ranges of an inbox up front.
The InboxIdler still uses ->each_inbox which will struggle with
100K inboxes.
Having messages in the top-level newsgroup name of an inbox will
still waste bandwidth for clients which want to do full syncs
once there's a rollover to a new 50K range. So instead, make
every inbox accessible exclusively via 50K slices in the form of
"$NEWSGROUP.$UID_MIN-$UID_END".
This introduces the DummyInbox, which makes $NEWSGROUP
and every parent component a selectable, empty inbox.
This aids navigation with mutt and possibly other MUAs.
Finally, the xt/perf-imap-list maintainer test is broken, now,
so remove it. The grep perlfunc is already proven effective,
and we'll have separate tests for mocking out ~100k inboxes.
---
MANIFEST | 2 +-
lib/PublicInbox/Config.pm | 7 ++-
lib/PublicInbox/DummyInbox.pm | 21 +++++++++
lib/PublicInbox/IMAP.pm | 64 +++++++++----------------
lib/PublicInbox/IMAPD.pm | 88 ++++++++++++++++-------------------
t/imap.t | 33 +++++++++++--
t/imapd.t | 22 +++++----
xt/imapd-mbsync-oimap.t | 5 +-
xt/imapd-validate.t | 9 ++--
xt/perf-imap-list.t | 38 ---------------
10 files changed, 139 insertions(+), 150 deletions(-)
create mode 100644 lib/PublicInbox/DummyInbox.pm
delete mode 100644 xt/perf-imap-list.t
diff --git a/MANIFEST b/MANIFEST
index 957228250a7..a133b71f881 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -105,6 +105,7 @@ lib/PublicInbox/DS.pm
lib/PublicInbox/DSKQXS.pm
lib/PublicInbox/DSPoll.pm
lib/PublicInbox/Daemon.pm
+lib/PublicInbox/DummyInbox.pm
lib/PublicInbox/Emergency.pm
lib/PublicInbox/Eml.pm
lib/PublicInbox/EmlContentFoo.pm
@@ -357,7 +358,6 @@ xt/imapd-validate.t
xt/mem-msgview.t
xt/msgtime_cmp.t
xt/nntpd-validate.t
-xt/perf-imap-list.t
xt/perf-msgview.t
xt/perf-nntpd.t
xt/perf-threading.t
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index c18c9c75b4f..19535beb973 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -105,13 +105,16 @@ sub iterate_start {
$self->{-iter} = [ \$i, $cb, $arg ];
}
-# for PublicInbox::DS::next_tick
+# for PublicInbox::DS::next_tick, we only call this is if
+# PublicInbox::DS is already loaded
sub event_step {
my ($self) = @_;
my ($i, $cb, $arg) = @{$self->{-iter}};
my $section = $self->{-section_order}->[$$i++];
delete($self->{-iter}) unless defined($section);
- $cb->($self, $section, $arg);
+ eval { $cb->($self, $section, $arg) };
+ warn "E: $@ in ${self}::event_step" if $@;
+ PublicInbox::DS::requeue($self) if defined($section);
}
sub lookup_newsgroup {
diff --git a/lib/PublicInbox/DummyInbox.pm b/lib/PublicInbox/DummyInbox.pm
new file mode 100644
index 00000000000..e38f9e5a432
--- /dev/null
+++ b/lib/PublicInbox/DummyInbox.pm
@@ -0,0 +1,21 @@
+# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+#
+# An EXAMINE-able, PublicInbox::Inbox-like object for IMAP. Some
+# IMAP clients don't like having unselectable parent mailboxes,
+# so we have a dummy
+package PublicInbox::DummyInbox;
+use strict;
+
+sub created_at { 0 } # Msgmap::created_at
+sub mm { shift }
+sub max { undef } # Msgmap::max
+sub msg_range { [] } # Msgmap::msg_range
+
+no warnings 'once';
+*query_xover = \&msg_range;
+*over = \&mm;
+*subscribe_unlock = *unsubscribe_unlock =
+ *get_art = *description = *base_url = \&max;
+
+1;
diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index 959dcfbe328..6f64dff9958 100644
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -192,26 +192,23 @@ sub cmd_done ($$) {
"$idle_tag OK Idle done\r\n";
}
-sub ensure_old_ranges_exist ($$$) {
- my ($self, $ibx, $uid_min) = @_;
- my $groups = $self->{imapd}->{groups};
- my $mailbox = $ibx->{newsgroup};
+sub ensure_ranges_exist ($$$) {
+ my ($imapd, $ibx, $max) = @_;
+ my $mailboxes = $imapd->{mailboxes};
+ my $mb_top = $ibx->{newsgroup};
my @created;
- $uid_min -= UID_BLOCK;
+ my $uid_min = UID_BLOCK * int($max/UID_BLOCK) + 1;
my $uid_end = $uid_min + UID_BLOCK - 1;
while ($uid_min > 0) {
- my $sub_mailbox = "$mailbox.$uid_min-$uid_end";
- last if exists $groups->{$sub_mailbox};
- $groups->{$sub_mailbox} = $ibx;
+ my $sub_mailbox = "$mb_top.$uid_min-$uid_end";
+ last if exists $mailboxes->{$sub_mailbox};
+ $mailboxes->{$sub_mailbox} = $ibx;
$uid_end -= UID_BLOCK;
$uid_min -= UID_BLOCK;
push @created, $sub_mailbox;
}
return unless @created;
- my $l = $self->{imapd}->{inboxlist};
- grep {
- / \Q$mailbox\E\r\n\z/ and s/\(\\HasNoChildren/\(\\HasChildren/;
- } @$l;
+ my $l = $imapd->{inboxlist} or return;
push @$l, map { qq[* LIST (\\HasNoChildren) "." $_\r\n] } @created;
}
@@ -222,41 +219,23 @@ sub cmd_examine ($$$) {
if ($mailbox =~ /\A(.+)\.([0-9]+)-([0-9]+)\z/) {
# old mail: inbox.comp.foo.$uid_min-$uid_end
my ($mb_top, $uid_min, $uid_end) = ($1, $2 + 0, $3 + 0);
- $ibx = $self->{imapd}->{groups}->{lc $mb_top};
- if (!$ibx || ($uid_end % UID_BLOCK) != 0 ||
- ($uid_min + UID_BLOCK - 1) != $uid_end) {
- return "$tag NO Mailbox doesn't exist: $mailbox\r\n";
- }
- $mm = $ibx->mm;
- $max = $mm->max // 0;
- # don't let users create inboxes w/ not-yet-possible range:
- $uid_min > $max and
+ $ibx = $self->{imapd}->{mailboxes}->{lc $mailbox} or
return "$tag NO Mailbox doesn't exist: $mailbox\r\n";
- $max = $uid_min + UID_BLOCK + 1;
+ $mm = $ibx->mm;
+ $max = $mm->max // 0;
$self->{uid_min} = $uid_min;
- ensure_old_ranges_exist($self, $ibx, $uid_min);
- } else { # current mailbox (most recent UID_BLOCK messages)
- $ibx = $self->{imapd}->{groups}->{lc $mailbox} or
+ ensure_ranges_exist($self->{imapd}, $ibx, $max);
+ $max = $uid_end if $max > $uid_end;
+ } else { # check for dummy inboxes
+ $ibx = $self->{imapd}->{mailboxes}->{lc $mailbox} or
return "$tag NO Mailbox doesn't exist: $mailbox\r\n";
-
+ delete $self->{uid_min};
+ $max = 0;
$mm = $ibx->mm;
- $max = $mm->max // 0;
-
- my $uid_min = UID_BLOCK * int($max/UID_BLOCK) + 1;
- if ($uid_min == 1) { # normal inbox with <UID_BLOCK messages
- delete $self->{uid_min}; # implicit cmd_close
- } else { # we have a giant inbox:
- $self->{uid_min} = $uid_min;
- ensure_old_ranges_exist($self, $ibx, $uid_min);
- }
}
- # 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"
- my $uidvalidity = $mm->created_at or return "$tag BAD UIDVALIDITY\r\n";
my $uidnext = $max + 1;
# XXX: do we need this? RFC 5162/7162
@@ -269,7 +248,7 @@ sub cmd_examine ($$$) {
* OK [PERMANENTFLAGS ()] Read-only mailbox\r
* OK [UNSEEN $max]\r
* OK [UIDNEXT $uidnext]\r
-* OK [UIDVALIDITY $uidvalidity]\r
+* OK [UIDVALIDITY $ibx->{uidvalidity}]\r
$tag OK [READ-ONLY] EXAMINE/SELECT done\r
EOF
}
@@ -561,7 +540,7 @@ sub uid_fetch_m { # long_response
sub cmd_status ($$$;@) {
my ($self, $tag, $mailbox, @items) = @_;
- my $ibx = $self->{imapd}->{groups}->{$mailbox} or
+ my $ibx = $self->{imapd}->{mailboxes}->{$mailbox} or
return "$tag NO Mailbox doesn't exist: $mailbox\r\n";
return "$tag BAD no items\r\n" if !scalar(@items);
($items[0] !~ s/\A\(//s || $items[-1] !~ s/\)\z//s) and
@@ -577,8 +556,7 @@ sub cmd_status ($$$;@) {
} elsif ($it eq 'UIDNEXT') {
push(@it, ($max //= $mm->max // 0) + 1);
} elsif ($it eq 'UIDVALIDITY') {
- push(@it, $mm->created_at //
- return("$tag BAD UIDVALIDITY\r\n"));
+ push(@it, $ibx->{uidvalidity});
} else {
return "$tag BAD invalid item\r\n";
}
diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index a10fabffb1f..b647c940505 100644
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -5,82 +5,75 @@
# see script/public-inbox-imapd for how it is used
package PublicInbox::IMAPD;
use strict;
-use parent qw(PublicInbox::NNTPD);
+use PublicInbox::Config;
use PublicInbox::InboxIdle;
use PublicInbox::IMAP;
-# *UID_BLOCK = \&PublicInbox::IMAP::UID_BLOCK;
+use PublicInbox::DummyInbox;
+my $dummy = bless { uidvalidity => 0 }, 'PublicInbox::DummyInbox';
sub new {
my ($class) = @_;
bless {
- groups => {},
+ mailboxes => {},
err => \*STDERR,
out => \*STDOUT,
- grouplist => [],
# accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
# pi_config => PublicInbox::Config
# idler => PublicInbox::InboxIdle
}, $class;
}
-sub refresh_inboxlist ($) {
- my ($self) = @_;
- my @names = map { $_->{newsgroup} } @{delete $self->{grouplist}};
- my %ns; # "\Noselect \HasChildren"
-
- if (my @uc = grep(/[A-Z]/, @names)) {
- warn "Uppercase not allowed for IMAP newsgroup(s):\n",
- map { "\t$_\n" } @uc;
- my %uc = map { $_ => 1 } @uc;
- @names = grep { !$uc{$_} } @names;
- }
- for (@names) {
- my $up = $_;
- while ($up =~ s/\.[^\.]+\z//) {
- $ns{$up} = '\\Noselect \\HasChildren';
- }
- }
- @names = map {;
- my $at = delete($ns{$_}) ? '\\HasChildren' : '\\HasNoChildren';
- qq[* LIST ($at) "." $_\r\n]
- } @names;
- push(@names, map { qq[* LIST ($ns{$_}) "." $_\r\n] } keys %ns);
- @names = sort {
- my ($xa) = ($a =~ / (\S+)\r\n/g);
- my ($xb) = ($b =~ / (\S+)\r\n/g);
- length($xa) <=> length($xb);
- } @names;
- $self->{inboxlist} = \@names;
-}
-
sub imapd_refresh_ibx { # pi_config->each_inbox cb
my ($ibx, $imapd) = @_;
my $ngname = $ibx->{newsgroup} or return;
if (ref $ngname) {
warn 'multiple newsgroups not supported: '.
join(', ', @$ngname). "\n";
+ return;
} elsif ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! ||
$ngname =~ /\.[0-9]+-[0-9]+\z/) {
- warn "mailbox name invalid: `$ngname'\n";
+ warn "mailbox name invalid: newsgroup=`$ngname'\n";
+ return;
}
-
+ $ibx->over or return;
+ $ibx->{over} = undef;
my $mm = $ibx->mm or return;
$ibx->{mm} = 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"
defined($ibx->{uidvalidity} = $mm->created_at) or return;
- $imapd->{tmp_groups}->{$ngname} = $ibx;
+ PublicInbox::IMAP::ensure_ranges_exist($imapd, $ibx, $mm->max // 1);
# preload to avoid fragmentation:
$ibx->description;
$ibx->base_url;
- # my $max = $mm->max // 0;
- # my $uid_min = UID_BLOCK * int($max/UID_BLOCK) + 1;
+
+ # ensure dummies are selectable
+ my $dummies = $imapd->{dummies};
+ do {
+ $dummies->{$ngname} = $dummy;
+ } while ($ngname =~ s/\.[^\.]+\z//);
}
sub imapd_refresh_finalize {
my ($imapd, $pi_config) = @_;
- $imapd->{groups} = delete $imapd->{tmp_groups};
- $imapd->{grouplist} = [ values %{$imapd->{groups}} ];
- refresh_inboxlist($imapd);
+ 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->{inboxlist} = [
+ map {
+ my $no = $mailboxes->{$_} == $dummy ? '' : 'No';
+ qq[* LIST (\\Has${no}Children) "." $_\r\n]
+ } sort { length($a) <=> length($b) } keys %$mailboxes
+ ];
$imapd->{pi_config} = $pi_config;
if (my $idler = $imapd->{idler}) {
$idler->refresh($pi_config);
@@ -92,8 +85,8 @@ sub imapd_refresh_step { # pi_config->iterate_start cb
if (defined($section)) {
return if $section !~ m!\Apublicinbox\.([^/]+)\z!;
my $ibx = $pi_config->lookup_name($1) or return;
- imapd_refresh_ibx($ibx, $imapd);
- } else { # "EOF"
+ imapd_refresh_ibx($ibx, $imapd->{imapd_next});
+ } else { # undef == "EOF"
imapd_refresh_finalize($imapd, $pi_config);
}
}
@@ -101,11 +94,12 @@ sub imapd_refresh_step { # pi_config->iterate_start cb
sub refresh_groups {
my ($self, $sig) = @_;
my $pi_config = PublicInbox::Config->new;
- $self->{tmp_groups} = {};
- if (0 && $sig) { # SIGHUP
+ if ($sig) { # SIGHUP is handled through the event loop
+ $self->{imapd_next} = { dummies => {}, mailboxes => {} };
$pi_config->iterate_start(\&imapd_refresh_step, $self);
PublicInbox::DS::requeue($pi_config); # call event_step
- } else { # initial start
+ } else { # initial start is synchronous
+ $self->{dummies} = {};
$pi_config->each_inbox(\&imapd_refresh_ibx, $self);
imapd_refresh_finalize($self, $pi_config);
}
diff --git a/t/imap.t b/t/imap.t
index aa262a19632..af59ef69386 100644
--- a/t/imap.t
+++ b/t/imap.t
@@ -6,16 +6,39 @@ use strict;
use Test::More;
use PublicInbox::IMAP;
use PublicInbox::IMAPD;
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite));
+require_git 2.6;
-{ # make sure we get '%' globbing right
+my ($tmpdir, $for_destroy) = tmpdir();
+my $cfgfile = "$tmpdir/config";
+{
+ open my $fh, '>', $cfgfile or BAIL_OUT $!;
+ print $fh <<EOF or BAIL_OUT $!;
+[publicinbox "a"]
+ inboxdir = $tmpdir/a
+ newsgroup = x.y.z
+[publicinbox "b"]
+ inboxdir = $tmpdir/b
+ newsgroup = x.z.y
+[publicinbox "c"]
+ inboxdir = $tmpdir/c
+ newsgroup = IGNORE.THIS
+EOF
+ close $fh or BAIL_OUT $!;
+ local $ENV{PI_CONFIG} = $cfgfile;
+ for my $x (qw(a b c)) {
+ ok(run_script(['-init', '-Lbasic', '-V2', $x, "$tmpdir/$x",
+ "https://example.com/$x", "$x\@example.com"]),
+ "init $x");
+ }
+ my $imapd = PublicInbox::IMAPD->new;
my @w;
local $SIG{__WARN__} = sub { push @w, @_ };
- my @n = map { { newsgroup => $_ } } (qw(x.y.z x.z.y IGNORE.THIS));
- my $self = { imapd => { grouplist => \@n } };
- PublicInbox::IMAPD::refresh_inboxlist($self->{imapd});
+ $imapd->refresh_groups;
+ my $self = { imapd => $imapd };
is(scalar(@w), 1, 'got a warning for upper-case');
like($w[0], qr/IGNORE\.THIS/, 'warned about upper-case');
-
my $res = PublicInbox::IMAP::cmd_list($self, 'tag', 'x', '%');
is(scalar($$res =~ tr/\n/\n/), 2, 'only one result');
like($$res, qr/ x\r\ntag OK/, 'saw expected');
diff --git a/t/imapd.t b/t/imapd.t
index a5324f78da0..017bfa0b27b 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -16,6 +16,9 @@ if ($can_compress) { # hope this gets fixed upstream, soon
$imap_client = 'PublicInbox::IMAPClient';
}
+require_ok 'PublicInbox::IMAP';
+my $first_range = '1-'.PublicInbox::IMAP::UID_BLOCK();
+
my $level = '-Lbasic';
SKIP: {
require_mods('Search::Xapian', 1);
@@ -87,11 +90,13 @@ ok(!$mic->examine('foo') && ($e = $@), 'EXAMINE non-existent');
like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent');
ok(!$mic->select('foo') && ($e = $@), 'EXAMINE non-existent');
like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent');
-ok($mic->select('inbox.i1'), 'SELECT succeeds');
-ok($mic->examine('INBOX.i1'), 'EXAMINE succeeds');
-my @raw = $mic->status('inbox.i1', qw(Messages uidnext uidvalidity));
+my $mailbox1 = "inbox.i1.$first_range";
+ok($mic->select('inbox.i1'), 'SELECT on parent succeeds');
+ok($mic->select($mailbox1), 'SELECT succeeds');
+ok($mic->examine($mailbox1), 'EXAMINE succeeds');
+my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity));
is(scalar(@raw), 2, 'got status response');
-like($raw[0], qr/\A\*\x20STATUS\x20inbox\.i1\x20
+like($raw[0], qr/\A\*\x20STATUS\x20inbox\.i1\.$first_range\x20
\(MESSAGES\x20\d+\x20UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
like($raw[1], qr/\A\S+ OK /, 'finished status response');
@@ -99,7 +104,7 @@ like($raw[1], qr/\A\S+ OK /, 'finished status response');
like($raw[0], qr/^\* LIST \(.*?\) "\." inbox/,
'got an inbox');
like($raw[-1], qr/^\S+ OK /, 'response ended with OK');
-is(scalar(@raw), scalar(@V) + 2, 'default LIST response');
+is(scalar(@raw), scalar(@V) + 4, 'default LIST response');
@raw = $mic->list('', 'inbox.i1');
is(scalar(@raw), 2, 'limited LIST response');
like($raw[0], qr/^\* LIST \(.*?\) "\." inbox/,
@@ -199,7 +204,7 @@ SKIP: {
skip 'Mail::IMAPClient too old for ->compress', 2 if !$can_compress;
my $c = $imap_client->new(%mic_opt);
ok($c && $c->compress, 'compress enabled');
- ok($c->examine('inbox.i1'), 'EXAMINE succeeds after COMPRESS');
+ ok($c->examine($mailbox1), 'EXAMINE succeeds after COMPRESS');
$ret = $c->search('uid 1:*') or BAIL_OUT "SEARCH FAIL $@";
is_deeply($ret, [ 1 ], 'search UID 1:* works after compression');
}
@@ -216,11 +221,12 @@ $pi_config->each_inbox(sub {
my $ng = $ibx->{newsgroup};
my $mic = $imap_client->new(%mic_opt);
ok($mic && $mic->login && $mic->IsAuthenticated, "authed $name");
- my $uidnext = $mic->uidnext($ng); # we'll fetch BODYSTRUCTURE on this
+ my $mb = "$ng.$first_range";
+ my $uidnext = $mic->uidnext($mb); # we'll fetch BODYSTRUCTURE on this
ok($uidnext, 'got uidnext for later fetch');
is_deeply([$mic->has_capability('IDLE')], ['IDLE'], "IDLE capa $name");
ok(!$mic->idle, "IDLE fails w/o SELECT/EXAMINE $name");
- ok($mic->examine($ng), "EXAMINE $ng succeeds");
+ ok($mic->examine($mb), "EXAMINE $ng succeeds");
ok(my $idle_tag = $mic->idle, "IDLE succeeds on $ng");
open(my $fh, '<', 't/data/message_embed.eml') or BAIL_OUT("open: $!");
diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t
index d2237a24bef..b2cb8737f82 100644
--- a/xt/imapd-mbsync-oimap.t
+++ b/xt/imapd-mbsync-oimap.t
@@ -13,12 +13,13 @@ my $inboxdir = $ENV{GIANT_INBOX_DIR};
plan skip_all => "bad characters in $inboxdir" if $inboxdir =~ m![^\w\.\-/]!;
my ($tmpdir, $for_destroy) = tmpdir();
my $cfg = "$tmpdir/cfg";
-my $mailbox = 'inbox.test';
+my $newsgroup = 'inbox.test';
+my $mailbox = "$newsgroup.1-50000";
{
open my $fh, '>', $cfg or BAIL_OUT "open: $!";
print $fh <<EOF or BAIL_OUT "print: $!";
[publicinbox "test"]
- newsgroup = $mailbox
+ newsgroup = $newsgroup
address = oimap\@example.com
inboxdir = $inboxdir
EOF
diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t
index f96ec8791b9..b7b66d0583f 100644
--- a/xt/imapd-validate.t
+++ b/xt/imapd-validate.t
@@ -30,7 +30,7 @@ if ($test_tls && !-r $key || !-r $cert) {
}
my ($tmpdir, $for_destroy) = tmpdir();
my %OPT = qw(User u Password p);
-my (%STARTTLS_OPT, %IMAPS_OPT, $td, $mailbox, $make_local_server);
+my (%STARTTLS_OPT, %IMAPS_OPT, $td, $newsgroup, $mailbox, $make_local_server);
if (($ENV{IMAP_TEST_URL} // '') =~ m!\Aimap://([^/]+)/(.+)\z!) {
($OPT{Server}, $mailbox) = ($1, $2);
$OPT{Server} =~ s/:([0-9]+)\z// and $OPT{Port} = $1 + 0;
@@ -39,6 +39,7 @@ if (($ENV{IMAP_TEST_URL} // '') =~ m!\Aimap://([^/]+)/(.+)\z!) {
} else {
require_mods(qw(DBD::SQLite));
$make_local_server->();
+ $mailbox = "$newsgroup.1-50000";
}
my %opts = (imap => \%OPT, 'imap+compress' => { %OPT, Compress => 1 });
@@ -124,15 +125,15 @@ BEGIN {
$make_local_server = sub {
require PublicInbox::Inbox;
- $mailbox = 'inbox.test';
- my $ibx = { inboxdir => $inbox_dir, newsgroup => $mailbox };
+ $newsgroup = 'inbox.test';
+ my $ibx = { inboxdir => $inbox_dir, newsgroup => $newsgroup };
$ibx = PublicInbox::Inbox->new($ibx);
my $pi_config = "$tmpdir/config";
{
open my $fh, '>', $pi_config or die "open($pi_config): $!";
print $fh <<"" or die "print $pi_config: $!";
[publicinbox "test"]
- newsgroup = $mailbox
+ newsgroup = $newsgroup
inboxdir = $inbox_dir
address = test\@example.com
diff --git a/xt/perf-imap-list.t b/xt/perf-imap-list.t
deleted file mode 100644
index 0f00f487991..00000000000
--- a/xt/perf-imap-list.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
-# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use Test::More;
-use_ok 'PublicInbox::IMAP';
-use_ok 'PublicInbox::IMAPD';
-use PublicInbox::DS;
-use Benchmark qw(:all);
-my @n = map { { newsgroup => "inbox.comp.foo.bar.$_" } } (0..50000);
-push @n, map { { newsgroup => "xobni.womp.foo.bar.$_" } } (0..50000);
-my $self = { imapd => { grouplist => \@n } };
-my $n = scalar @n;
-my $t = timeit(1, sub {
- PublicInbox::IMAPD::refresh_inboxlist($self->{imapd});
-});
-diag timestr($t). "refresh $n inboxes";
-
-open my $null, '>', '/dev/null' or BAIL_OUT "open: $!";
-my $ds = { sock => $null };
-my $nr = 200;
-diag "starting benchmark...";
-my $cmd_list = \&PublicInbox::IMAP::cmd_list;
-$t = timeit(1, sub {
- for (0..$nr) {
- my $res = $cmd_list->($self, 'tag', '', '*');
- PublicInbox::DS::write($ds, $res);
- }
-});
-diag timestr($t). "list all for $n inboxes $nr times";
-$nr = 20;
-$t = timeit(1, sub {
- for (0..$nr) {
- my $res = $cmd_list->($self, 'tag', 'inbox.', '%');
- PublicInbox::DS::write($ds, $res);
- }
-});
-diag timestr($t). "list partial for $n inboxes $nr times";
-done_testing;
^ permalink raw reply related [relevance 3%]
* [PATCH 00/82] public-inbox-imapd: read-only IMAP server
@ 2020-06-10 7:03 7% Eric Wong
2020-06-10 7:04 3% ` [PATCH 43/82] imap: require ".$UID_MIN-$UID_END" suffix Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-06-10 7:03 UTC (permalink / raw)
To: meta
So I finally wrote my first IMAP server! And I'm actually
fairly satisfied with how it's turning out to support a bunch
of other performance + scalability work I've wanted to do.
Some previous notes here:
https://public-inbox.org/meta/20200609113442.GA16856@dcvr/
I finally seem to have gotten it to play nicely with mutt header
caching, so it's fit for public consumption :)
imaps://news.public-inbox.org/INBOX.comp.mail.public-inbox.meta.0
You can use any username+password, and AUTH=ANONYMOUS also
works if your client does that.
It doesn't support UTF-7 (mailbox names) or advertise UTF-8
in CAPABILITIES, yet; I still have RFCs to read :P
And there's a bunch of new things which could use some
testing from non-mutt/mbsync/offlineimap users.
Maybe you'll find some client-side bugs like I did :P
v1 reindexing also gets a little bit of parallelism :)
Anyways, I'll probably be porting some of the scalability
and slow-storage work to older parts of the code before
fiddling with more IMAP extensions.
Eric Wong (82):
doc: add some IMAP standards
nntpd: restrict allowed newsgroup names
preliminary imap server implementation
inboxidle: new class to detect inbox changes
imap: support IDLE
msgmap: split ->max into its own method
imap: delay InboxIdle start, support refresh
imap: implement STATUS command
imap: use Text::ParseWords::parse_line to handle quoted words
imap: support LIST command
t/imapd: support FakeInotify and KQNotify
imap: support fetch for BODYSTRUCTURE and BODY
eml: each_part: single part $idx is 1
imap: allow fetch of partial of BODY[...] and headers
imap: always include `resp-text' in responses
imap: split out unit tests and benchmarks
imap: fix multi-message partial header fetches
imap: simplify partial fetch structure
imap: support sequence number FETCH
imap: do not include ".PEEK" in responses
imap: support the CLOSE command
imap: speed up HEADER.FIELDS[.NOT] range fetches
git: async: flatten the inflight array
git: do our own read buffering for cat-file
imap: use git-cat-file asynchronously
git: idle rbuf for async
imap: support LSUB command
imap: FETCH: support comma-delimited ranges
add imapd compression test
testcommon: tcp_(server|connect): BAIL_OUT on failure
*deflate: drop invalid comment about rbuf
imap: fix pipelining with async git
git: cat_async: provide requested OID + "missing" on missing blobs
git: move async_cat reference to PublicInbox::Git
git: async: automatic retry on alternates change
imapclient: wrapper for Mail::IMAPClient
xt: add imapd-validate and imapd-mbsync-oimap
imap: support out-of-bounds ranges
xt/perf-imap-list: time refresh_inboxlist
imap: case-insensitive mailbox name comparisons
imap: break giant inboxes into sub-inboxes of 50K messages
imap: start introducing iterative config reloading
imap: require ".$UID_MIN-$UID_END" suffix
imapd: ensure LIST is sorted alphabetically, for now
imap: omit $UID_END from mailbox name, use index
t/config.t: always compare against git bool behavior
xt/*: show some tunable parameters
imap: STATUS and LIST are case-insensitive, too
imap: EXAMINE/STATUS: return correct counts
imap: avoid uninitialized warnings on incomplete commands
imap: start parsing out queries for SQLite and Xapian
imap: SEARCH: clamp results to the 50K UID range
imap: allow UID range search on timestamps
over: get_art: use dbh->prepare_cached
search: index byte size of a message for IMAP search
search: index UID for IMAP search, too
imap: remove dummies from sequence number FETCH
imap: compile UID FETCH to opcodes
imap: UID FETCH: optimize for smsg-only case
imap: UID FETCH: optimize (UID FLAGS) harder
imap: IDLE: avoid extraneous wakeups, keep-alive
imap: 30 minute auto-logout timer
imap: split ->logged_in attribute into a separate class
searchidx: v1 (re)-index uses git asynchronously
index: account for CRLF conversion when storing bytes
imap: rely on smsg->{bytes} for RFC822.SIZE
imap: UID FETCH requires at least one data item
imap: LIST shows "INBOX" in all caps
imap: support 8000 octet lines
imap: reinstate some message sequence number support
imap: cleanup ->{uid_base} usage
imap: FETCH: more granular CRLF conversion
imap: further speed up HEADER.FIELDS FETCH requests
imap: FETCH: try to make fake MSNs sequentially
imap: STATUS/EXAMINE: rely on SQLite overview
imap: UID SEARCH: support multiple ranges
imap: wire up Xapian search, msn SEARCH and multiple ranges
imap: misc cleanups and notes
imapd: don't bother sorting LIST output
imap: drop non-UID SEARCH for now
over: uid_range: remove LIMIT
imap: FETCH: proper MSN => UID mapping for requests
Documentation/public-inbox-imapd.pod | 91 ++
Documentation/standards.perl | 10 +
MANIFEST | 18 +
lib/PublicInbox/Config.pm | 18 +
lib/PublicInbox/Daemon.pm | 24 +-
lib/PublicInbox/DummyInbox.pm | 22 +
lib/PublicInbox/Eml.pm | 9 +-
lib/PublicInbox/FakeInotify.pm | 59 ++
lib/PublicInbox/Git.pm | 163 +--
lib/PublicInbox/GitAsyncCat.pm | 51 +
lib/PublicInbox/IMAP.pm | 1397 ++++++++++++++++++++++++++
lib/PublicInbox/IMAPClient.pm | 119 +++
lib/PublicInbox/IMAPD.pm | 114 +++
lib/PublicInbox/IMAPdeflate.pm | 126 +++
lib/PublicInbox/Import.pm | 2 +-
lib/PublicInbox/In2Tie.pm | 17 +
lib/PublicInbox/Inbox.pm | 33 +-
lib/PublicInbox/InboxIdle.pm | 79 ++
lib/PublicInbox/KQNotify.pm | 66 ++
lib/PublicInbox/Lock.pm | 7 +
lib/PublicInbox/MsgIter.pm | 2 +-
lib/PublicInbox/Msgmap.pm | 20 +-
lib/PublicInbox/NNTPD.pm | 12 +-
lib/PublicInbox/NNTPdeflate.pm | 1 -
lib/PublicInbox/Over.pm | 50 +-
lib/PublicInbox/Search.pm | 32 +-
lib/PublicInbox/SearchIdx.pm | 89 +-
lib/PublicInbox/SearchIdxShard.pm | 11 +-
lib/PublicInbox/Smsg.pm | 8 +-
lib/PublicInbox/TestCommon.pm | 7 +-
lib/PublicInbox/V2Writable.pm | 10 +-
script/public-inbox-imapd | 14 +
t/config.t | 15 +-
t/eml.t | 2 +-
t/git.t | 40 +-
t/imap.t | 133 +++
t/imapd-tls.t | 204 ++++
t/imapd.t | 398 ++++++++
t/import.t | 5 +-
t/inbox_idle.t | 72 ++
t/nntpd.t | 5 +-
t/over.t | 3 +
t/search.t | 19 +
xt/cmp-msgstr.t | 1 -
xt/cmp-msgview.t | 1 -
xt/eml_check_limits.t | 6 +-
xt/git_async_cmp.t | 2 +-
xt/imapd-mbsync-oimap.t | 132 +++
xt/imapd-validate.t | 177 ++++
xt/mem-msgview.t | 1 +
xt/msgtime_cmp.t | 1 -
xt/perf-msgview.t | 1 -
52 files changed, 3718 insertions(+), 181 deletions(-)
create mode 100644 Documentation/public-inbox-imapd.pod
create mode 100644 lib/PublicInbox/DummyInbox.pm
create mode 100644 lib/PublicInbox/FakeInotify.pm
create mode 100644 lib/PublicInbox/GitAsyncCat.pm
create mode 100644 lib/PublicInbox/IMAP.pm
create mode 100644 lib/PublicInbox/IMAPClient.pm
create mode 100644 lib/PublicInbox/IMAPD.pm
create mode 100644 lib/PublicInbox/IMAPdeflate.pm
create mode 100644 lib/PublicInbox/In2Tie.pm
create mode 100644 lib/PublicInbox/InboxIdle.pm
create mode 100644 lib/PublicInbox/KQNotify.pm
create mode 100644 script/public-inbox-imapd
create mode 100644 t/imap.t
create mode 100644 t/imapd-tls.t
create mode 100644 t/imapd.t
create mode 100644 t/inbox_idle.t
create mode 100644 xt/imapd-mbsync-oimap.t
create mode 100644 xt/imapd-validate.t
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-06-10 7:03 7% [PATCH 00/82] public-inbox-imapd: read-only IMAP server Eric Wong
2020-06-10 7:04 3% ` [PATCH 43/82] imap: require ".$UID_MIN-$UID_END" suffix Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).