From a62624ba8aa07f4d38d6d99623f6a2e679193896 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 10 Jun 2020 07:04:06 +0000 Subject: [PATCH] imap: use Text::ParseWords::parse_line to handle quoted words IMAP clients may quote args and escape similar to POSIX shell, so attempt to handle them properly using this standard library module. --- lib/PublicInbox/IMAP.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index a2d59e5c..7745d9f9 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -20,6 +20,7 @@ use fields qw(imapd logged_in ibx long_cb -login_tag use PublicInbox::Eml; use PublicInbox::DS qw(now); use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT); +use Text::ParseWords qw(parse_line); use Errno qw(EAGAIN); my $Address; for my $mod (qw(Email::Address::XS Mail::Address)) { @@ -423,7 +424,8 @@ sub args_ok ($$) { # duplicated from PublicInbox::NNTP # returns 1 if we can continue, 0 if not due to buffered writes or disconnect sub process_line ($$) { my ($self, $l) = @_; - my ($tag, $req, @args) = split(/[ \t]+/, $l); + my ($tag, $req, @args) = parse_line('[ \t]+', 0, $l); + pop(@args) if (@args && !defined($args[-1])); if (@args && uc($req) eq 'UID') { $req .= "_".(shift @args); } -- 2.44.0