From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 57/82] imap: remove dummies from sequence number FETCH
Date: Wed, 10 Jun 2020 07:04:54 +0000 [thread overview]
Message-ID: <20200610070519.18252-58-e@yhbt.net> (raw)
In-Reply-To: <20200610070519.18252-1-e@yhbt.net>
Dummy messages make for bad user experience with MUAs which
still use sequence numbers. Not being able to fetch a message
doesn't seem fatal in mutt, so just ignore (sometimes large)
gaps.
---
lib/PublicInbox/IMAP.pm | 61 ++++-------------------------------------
t/imapd.t | 3 +-
2 files changed, 6 insertions(+), 58 deletions(-)
diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index 78042b9e2ee..8307343cf15 100644
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -9,8 +9,9 @@
# data notes:
# * NNTP article numbers are UIDs and message sequence numbers (MSNs)
# * Message sequence numbers (MSNs) can be stable since we're read-only.
-# Most IMAP clients use UIDs (I hope), and we can return a dummy
-# message if a client requests a non-existent MSN.
+# Most IMAP clients use UIDs (I hope). We may return a dummy message
+# in the future if a client requests a non-existent MSN, but that seems
+# unecessary with mutt.
package PublicInbox::IMAP;
use strict;
@@ -398,22 +399,6 @@ sub fetch_body ($;$) {
join('', @hold);
}
-sub dummy_message ($$) {
- my ($self, $seqno) = @_;
- my $ret = <<EOF;
-From: nobody\@localhost\r
-To: nobody\@localhost\r
-Date: Thu, 01 Jan 1970 00:00:00 +0000\r
-Message-ID: <dummy-$seqno\@$self->{ibx}->{newsgroup}>\r
-Subject: dummy message #$seqno\r
-\r
-You're seeing this message because your IMAP client didn't use UIDs.\r
-The message which used to use this sequence number was likely spam\r
-and removed by the administrator.\r
-EOF
- \$ret;
-}
-
sub requeue_once ($) {
my ($self) = @_;
# COMPRESS users all share the same DEFLATE context.
@@ -437,8 +422,7 @@ sub uid_fetch_cb { # called by git->cat_async via git_async_cat
if (!defined($oid)) {
# it's possible to have TOCTOU if an admin runs
# public-inbox-(edit|purge), just move onto the next message
- return requeue_once($self) unless defined $want->{-seqno};
- $bref = dummy_message($self, $smsg->{num});
+ return requeue_once($self);
} else {
$smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
}
@@ -764,42 +748,6 @@ sub cmd_uid_fetch ($$$;@) {
$args; # error
}
-sub seq_fetch_m { # long_response
- my ($self, $tag, $msgs, $range_info, $want) = @_;
- while (!@$msgs) { # rare
- if (my $end = refill_range($self, $msgs, $range_info)) {
- $self->write(\"$tag $end\r\n");
- return;
- }
- }
- my $seq = $want->{-seqno}++;
- my $cur_num = $msgs->[0]->{num};
- if ($cur_num == $seq) { # as expected
- git_async_cat($self->{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';
- unshift @$msgs, $smsg;
- my $bref = dummy_message($self, $seq);
- uid_fetch_cb($bref, undef, undef, undef, \@_);
- $smsg; # blessed response since uid_fetch_cb requeues
- } else { # should not happen
- die "BUG: cur_num=$cur_num < seq=$seq";
- }
-}
-
-sub cmd_fetch ($$$;@) {
- my ($self, $tag, $range_csv, @want) = @_;
- my $args = fetch_common($self, $tag, $range_csv, \@want);
- ref($args) eq 'ARRAY' ? do {
- my $want = $args->[-1];
- $want->{-seqno} = $args->[2]->[0]; # $beg == $range_info->[0];
- long_response($self, \&seq_fetch_m, @$args)
- } : $args; # error
-}
-
-
sub parse_date ($) { # 02-Oct-1993
my ($date_text) = @_;
my ($dd, $mon, $yyyy) = split(/-/, $_[0], 3);
@@ -1147,5 +1095,6 @@ sub close {
# we're read-only, so SELECT and EXAMINE do the same thing
no warnings 'once';
*cmd_select = \&cmd_examine;
+*cmd_fetch = \&cmd_uid_fetch;
1;
diff --git a/t/imapd.t b/t/imapd.t
index 2546ab51ac6..233be9f2c0a 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -348,8 +348,7 @@ is(scalar keys %$ret, 3, 'got all 3 messages');
run_script(\@cmd, $env, $rdr) or BAIL_OUT('-learn rm');
}
my $r2 = $mic->fetch_hash('1:*', 'BODY.PEEK[]') or BAIL_OUT "FETCH $@";
-is(scalar keys %$r2, 3, 'still got all 3 messages');
-like($r2->{1}->{'BODY[]'}, qr/dummy message #1/, 'got dummy message 1');
+is(scalar keys %$r2, 2, 'did not get all 3 messages');
is($r2->{2}->{'BODY[]'}, $ret->{2}->{RFC822}, 'message 2 unchanged');
is($r2->{3}->{'BODY[]'}, $ret->{3}->{RFC822}, 'message 3 unchanged');
$r2 = $mic->fetch_hash(2, 'BODY.PEEK[HEADER.FIELDS (message-id)]')
next prev parent reply other threads:[~2020-06-10 7:07 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 7:03 [PATCH 00/82] public-inbox-imapd: read-only IMAP server Eric Wong
2020-06-10 7:03 ` [PATCH 01/82] doc: add some IMAP standards Eric Wong
2020-06-10 7:03 ` [PATCH 02/82] nntpd: restrict allowed newsgroup names Eric Wong
2020-06-10 7:04 ` [PATCH 03/82] preliminary imap server implementation Eric Wong
2020-06-10 7:04 ` [PATCH 04/82] inboxidle: new class to detect inbox changes Eric Wong
2020-06-10 7:04 ` [PATCH 05/82] imap: support IDLE Eric Wong
2020-06-10 7:04 ` [PATCH 06/82] msgmap: split ->max into its own method Eric Wong
2020-06-10 7:04 ` [PATCH 07/82] imap: delay InboxIdle start, support refresh Eric Wong
2020-06-10 7:04 ` [PATCH 08/82] imap: implement STATUS command Eric Wong
2020-06-10 7:04 ` [PATCH 09/82] imap: use Text::ParseWords::parse_line to handle quoted words Eric Wong
2020-06-10 7:04 ` [PATCH 10/82] imap: support LIST command Eric Wong
2020-06-10 7:04 ` [PATCH 11/82] t/imapd: support FakeInotify and KQNotify Eric Wong
2020-06-10 7:04 ` [PATCH 12/82] imap: support fetch for BODYSTRUCTURE and BODY Eric Wong
2020-06-10 7:04 ` [PATCH 13/82] eml: each_part: single part $idx is 1 Eric Wong
2020-06-10 7:04 ` [PATCH 14/82] imap: allow fetch of partial of BODY[...] and headers Eric Wong
2020-06-10 7:04 ` [PATCH 15/82] imap: always include `resp-text' in responses Eric Wong
2020-06-10 7:04 ` [PATCH 16/82] imap: split out unit tests and benchmarks Eric Wong
2020-06-10 7:04 ` [PATCH 17/82] imap: fix multi-message partial header fetches Eric Wong
2020-06-10 7:04 ` [PATCH 18/82] imap: simplify partial fetch structure Eric Wong
2020-06-10 7:04 ` [PATCH 19/82] imap: support sequence number FETCH Eric Wong
2020-06-10 7:04 ` [PATCH 20/82] imap: do not include ".PEEK" in responses Eric Wong
2020-06-10 7:04 ` [PATCH 21/82] imap: support the CLOSE command Eric Wong
2020-06-10 7:04 ` [PATCH 22/82] imap: speed up HEADER.FIELDS[.NOT] range fetches Eric Wong
2020-06-10 7:04 ` [PATCH 23/82] git: async: flatten the inflight array Eric Wong
2020-06-10 7:04 ` [PATCH 24/82] git: do our own read buffering for cat-file Eric Wong
2020-06-10 7:04 ` [PATCH 25/82] imap: use git-cat-file asynchronously Eric Wong
2020-06-10 7:04 ` [PATCH 26/82] git: idle rbuf for async Eric Wong
2020-06-10 7:04 ` [PATCH 27/82] imap: support LSUB command Eric Wong
2020-06-10 7:04 ` [PATCH 28/82] imap: FETCH: support comma-delimited ranges Eric Wong
2020-06-10 7:04 ` [PATCH 29/82] add imapd compression test Eric Wong
2020-06-10 7:04 ` [PATCH 30/82] testcommon: tcp_(server|connect): BAIL_OUT on failure Eric Wong
2020-06-10 7:04 ` [PATCH 31/82] *deflate: drop invalid comment about rbuf Eric Wong
2020-06-10 7:04 ` [PATCH 32/82] imap: fix pipelining with async git Eric Wong
2020-06-10 7:04 ` [PATCH 33/82] git: cat_async: provide requested OID + "missing" on missing blobs Eric Wong
2020-06-10 7:04 ` [PATCH 34/82] git: move async_cat reference to PublicInbox::Git Eric Wong
2020-06-10 7:04 ` [PATCH 35/82] git: async: automatic retry on alternates change Eric Wong
2020-06-10 7:04 ` [PATCH 36/82] imapclient: wrapper for Mail::IMAPClient Eric Wong
2020-06-10 7:04 ` [PATCH 37/82] xt: add imapd-validate and imapd-mbsync-oimap Eric Wong
2020-06-10 7:04 ` [PATCH 38/82] imap: support out-of-bounds ranges Eric Wong
2020-06-10 7:04 ` [PATCH 39/82] xt/perf-imap-list: time refresh_inboxlist Eric Wong
2020-06-10 7:04 ` [PATCH 40/82] imap: case-insensitive mailbox name comparisons Eric Wong
2020-06-10 7:04 ` [PATCH 41/82] imap: break giant inboxes into sub-inboxes of 50K messages Eric Wong
2020-06-10 7:04 ` [PATCH 42/82] imap: start doing iterative config reloading Eric Wong
2020-06-10 7:04 ` [PATCH 43/82] imap: require ".$UID_MIN-$UID_END" suffix Eric Wong
2020-06-10 7:04 ` [PATCH 44/82] imapd: ensure LIST is sorted alphabetically, for now Eric Wong
2020-06-10 7:04 ` [PATCH 45/82] imap: omit $UID_END from mailbox name, use index Eric Wong
2020-06-10 7:04 ` [PATCH 46/82] t/config.t: always compare against git bool behavior Eric Wong
2020-06-10 7:04 ` [PATCH 47/82] xt/*: show some tunable parameters Eric Wong
2020-06-10 7:04 ` [PATCH 48/82] imap: STATUS and LIST are case-insensitive, too Eric Wong
2020-06-10 7:04 ` [PATCH 49/82] imap: EXAMINE/STATUS: return correct counts Eric Wong
2020-06-10 7:04 ` [PATCH 50/82] imap: avoid uninitialized warnings on incomplete commands Eric Wong
2020-06-10 7:04 ` [PATCH 51/82] imap: start parsing out queries for SQLite and Xapian Eric Wong
2020-06-10 7:04 ` [PATCH 52/82] imap: SEARCH: clamp results to the 50K UID range Eric Wong
2020-06-10 7:04 ` [PATCH 53/82] imap: allow UID range search on timestamps Eric Wong
2020-06-10 7:04 ` [PATCH 54/82] over: get_art: use dbh->prepare_cached Eric Wong
2020-06-10 7:04 ` [PATCH 55/82] search: index byte size of a message for IMAP search Eric Wong
2020-06-10 7:04 ` [PATCH 56/82] search: index UID for IMAP search, too Eric Wong
2020-06-10 7:04 ` Eric Wong [this message]
2020-06-10 7:04 ` [PATCH 58/82] imap: compile UID FETCH to opcodes Eric Wong
2020-06-10 7:04 ` [PATCH 59/82] imap: UID FETCH: optimize for smsg-only case Eric Wong
2020-06-10 7:04 ` [PATCH 60/82] imap: UID FETCH: optimize (UID FLAGS) harder Eric Wong
2020-06-10 7:04 ` [PATCH 61/82] imap: IDLE: avoid extraneous wakeups, keep-alive Eric Wong
2020-06-10 7:04 ` [PATCH 62/82] imap: 30 minute auto-logout timer Eric Wong
2020-06-10 7:05 ` [PATCH 63/82] imap: split ->logged_in attribute into a separate class Eric Wong
2020-06-10 7:05 ` [PATCH 64/82] searchidx: v1 (re)-index uses git asynchronously Eric Wong
2020-06-10 7:05 ` [PATCH 65/82] index: account for CRLF conversion when storing bytes Eric Wong
2020-06-10 7:05 ` [PATCH 66/82] imap: rely on smsg->{bytes} for RFC822.SIZE Eric Wong
2020-06-10 7:05 ` [PATCH 67/82] imap: UID FETCH requires at least one data item Eric Wong
2020-06-10 7:05 ` [PATCH 68/82] imap: LIST shows "INBOX" in all caps Eric Wong
2020-06-10 7:05 ` [PATCH 69/82] imap: support 8000 octet lines Eric Wong
2020-06-10 7:05 ` [PATCH 70/82] imap: reinstate some message sequence number support Eric Wong
2020-06-10 7:05 ` [PATCH 71/82] imap: cleanup ->{uid_base} usage Eric Wong
2020-06-10 7:05 ` [PATCH 72/82] imap: FETCH: more granular CRLF conversion Eric Wong
2020-06-10 7:05 ` [PATCH 73/82] imap: further speed up HEADER.FIELDS FETCH requests Eric Wong
2020-06-10 7:05 ` [PATCH 74/82] imap: FETCH: try to make fake MSNs sequentially Eric Wong
2020-06-10 7:05 ` [PATCH 75/82] imap: STATUS/EXAMINE: rely on SQLite overview Eric Wong
2020-06-10 7:05 ` [PATCH 76/82] imap: UID SEARCH: support multiple ranges Eric Wong
2020-06-10 7:05 ` [PATCH 77/82] imap: wire up Xapian, MSN SEARCH and multi sequence-sets Eric Wong
2020-06-10 7:05 ` [PATCH 78/82] imap: misc cleanups and notes Eric Wong
2020-06-10 7:05 ` [PATCH 79/82] imapd: don't bother sorting LIST output Eric Wong
2020-06-10 7:05 ` [PATCH 80/82] imap: remove non-UID SEARCH for now Eric Wong
2020-06-10 7:05 ` [PATCH 81/82] over: uid_range: remove LIMIT Eric Wong
2020-06-10 7:05 ` [PATCH 82/82] imap: FETCH: proper MSN => UID mapping for requests Eric Wong
2020-06-12 23:49 ` [PATCH 83/82] imap: introduce memory-efficient uo2m mapping Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200610070519.18252-58-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).