user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] imap: clarify "DONE" usage with IDLE
Date: Mon, 15 Jun 2020 03:30:03 +0000	[thread overview]
Message-ID: <20200615033003.25436-1-e@yhbt.net> (raw)

"DONE" is a continuation and not a normal IMAP command, so
ensure it can't be called like a normal IMAP command which
has a tag.
---
 lib/PublicInbox/IMAP.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index bc890517..9ae7c60e 100644
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -358,7 +358,7 @@ sub stop_idle ($$) {
 	$ibx->unsubscribe_unlock($fd);
 }
 
-sub cmd_done ($$) {
+sub idle_done ($$) {
 	my ($self, $tag) = @_; # $tag is "DONE" (case-insensitive)
 	defined(my $idle_tag = delete $self->{-idle_tag}) or
 		return "$tag BAD not idle\r\n";
@@ -1310,12 +1310,12 @@ sub process_line ($$) {
 		$req .= "_".(shift @args);
 	}
 	my $res = eval {
-		if (my $cmd = $self->can('cmd_'.lc($req // ''))) {
-			defined($self->{-idle_tag}) ?
-				"$self->{-idle_tag} BAD expected DONE\r\n" :
-				$cmd->($self, $tag, @args);
-		} elsif (uc($tag // '') eq 'DONE' && !defined($req)) {
-			cmd_done($self, $tag);
+		if (defined(my $idle_tag = $self->{-idle_tag})) {
+			(uc($tag // '') eq 'DONE' && !defined($req)) ?
+				idle_done($self, $tag) :
+				"$idle_tag BAD expected DONE\r\n";
+		} elsif (my $cmd = $self->can('cmd_'.lc($req // ''))) {
+			$cmd->($self, $tag, @args);
 		} else { # this is weird
 			auth_challenge_ok($self) //
 					($tag // '*') .

                 reply	other threads:[~2020-06-15  3:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20200615033003.25436-1-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.org \
    --subject='Re: [PATCH] imap: clarify "DONE" usage with IDLE' \
    /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

Code repositories for project(s) associated with this 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).