about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-09-16 20:56:44 -0500
committerEric Wong <e@80x24.org>2021-09-17 04:41:07 +0000
commit23ac27869da4744aba2a67454504b7a157583df7 (patch)
treeb0438077d9203764a90a2ac9a78b1954f1df4db2
parenta6b2025c0ac0e9619dbe164c1b28a35bf25576a3 (diff)
downloadpublic-inbox-23ac27869da4744aba2a67454504b7a157583df7.tar.gz
Like with Maildir, IMAP folders can be deleted entirely.
Ensure they can be eliminated, but don't be fooled into
removing them if they're temporarily unreachable.
-rw-r--r--lib/PublicInbox/LeiRefreshMailSync.pm11
-rw-r--r--t/lei-refresh-mail-sync.t60
2 files changed, 67 insertions, 4 deletions
diff --git a/lib/PublicInbox/LeiRefreshMailSync.pm b/lib/PublicInbox/LeiRefreshMailSync.pm
index 19f64b58..09a7ead0 100644
--- a/lib/PublicInbox/LeiRefreshMailSync.pm
+++ b/lib/PublicInbox/LeiRefreshMailSync.pm
@@ -53,10 +53,13 @@ sub input_path_url { # overrides PublicInbox::LeiInput::input_path_url
                 PublicInbox::LeiInput::input_path_url($self, $input);
         } elsif ($input =~ m!\Aimaps?://!i) {
                 my $uri = PublicInbox::URIimap->new($input);
-                my $mic = $self->{lei}->{net}->mic_for_folder($uri);
-                my $uids = $mic->search('UID 1:*');
-                $uids = +{ map { $_ => undef } @$uids };
-                $lms->each_src($$uri, \&prune_imap, $self, $uids, $$uri);
+                if (my $mic = $self->{lei}->{net}->mic_for_folder($uri)) {
+                        my $uids = $mic->search('UID 1:*');
+                        $uids = +{ map { $_ => undef } @$uids };
+                        $lms->each_src($$uri, \&prune_imap, $self, $uids, $$uri)
+                } else {
+                        $self->folder_missing($$uri);
+                }
         } else { die "BUG: $input not supported" }
         $self->{lei}->{pkt_op_p}->pkt_do('sto_done_request');
 }
diff --git a/t/lei-refresh-mail-sync.t b/t/lei-refresh-mail-sync.t
index d3438011..90356b57 100644
--- a/t/lei-refresh-mail-sync.t
+++ b/t/lei-refresh-mail-sync.t
@@ -72,6 +72,66 @@ test_lei({ daemon_only => 1 }, sub {
         is($lei_out, '{}', 'no known locations after "removal"');
         lei_ok 'ls-mail-sync';
         is($lei_out, '', 'no sync left when folder is gone');
+
+SKIP: {
+        require_mods(qw(-imapd -nntpd Mail::IMAPClient Net::NNTP), 1);
+        require File::Copy; # stdlib
+        my $home = $ENV{HOME};
+        my $srv;
+        my $cfg_path2 = "$home/cfg2";
+        File::Copy::cp($cfg_path, $cfg_path2);
+        my $env = { PI_CONFIG => $cfg_path2 };
+        for my $x (qw(imapd)) {
+                my $s = tcp_server;
+                my $cmd = [ "-$x", '-W0', "--stdout=$home/$x.out",
+                        "--stderr=$home/$x.err" ];
+                my $td = start_script($cmd, $env, { 3 => $s}) or xbail("-$x");
+                $srv->{$x} = {
+                        addr => (my $scalar = tcp_host_port($s)),
+                        td => $td,
+                        cmd => $cmd,
+                };
+        }
+        my $url = "imap://$srv->{imapd}->{addr}/t.v1.0";
+        lei_ok 'import', $url, '+L:v1';
+        lei_ok 'inspect', "blob:$oid";
+        $before = json_utf8->decode($lei_out);
+        my @f = grep(m!\Aimap://;AUTH=ANONYMOUS\@\Q$srv->{imapd}->{addr}\E!,
+                keys %{$before->{'mail-sync'}});
+        is(scalar(@f), 1, 'got IMAP folder') or xbail(\@f);
+        xsys([qw(git config), '-f', $cfg_path2,
+                qw(--unset publicinbox.t1.newsgroup)]) and
+                xbail "git config $?";
+        $stop_daemon->(); # drop IMAP IDLE
+        $srv->{imapd}->{td}->kill('HUP');
+        tick; # wait for HUP
+        lei_ok 'refresh-mail-sync', $url;
+        lei_ok 'inspect', "blob:$oid";
+        my $after = json_utf8->decode($lei_out);
+        ok(!$after->{'mail-sync'}, 'no sync info for non-existent mailbox');
+        lei_ok 'ls-mail-sync';
+        unlike $lei_out, qr!^\Q$f[0]\E!, 'IMAP folder gone from mail_sync';
+
+        # simulate server downtime
+        $url = "imap://$srv->{imapd}->{addr}/t.v2.0";
+        lei_ok 'import', $url, '+L:v2';
+
+        lei_ok 'inspect', "blob:$oid";
+        $before = $lei_out;
+        delete $srv->{imapd}->{td}; # kill + join daemon
+
+        ok(!(lei 'refresh-mail-sync', $url), 'URL fails on dead -imapd');
+        ok(!(lei 'refresh-mail-sync', '--all'), '--all fails on dead -imapd');
+
+        # restart server (somewhat dangerous since we released the socket)
+        my $cmd = $srv->{imapd}->{cmd};
+        push @$cmd, '-l', $srv->{imapd}->{addr};
+        $srv->{imapd}->{td} = start_script($cmd, $env) or xbail "@$cmd";
+
+        lei_ok 'refresh-mail-sync', '--all';
+        lei_ok 'inspect', "blob:$oid";
+        is($lei_out, $before, 'no changes when server was down');
+}; # imapd+nntpd stuff
 });
 
 done_testing;