From b84184545355956669e5ea549c2701241b08ec38 Mon Sep 17 00:00:00 2001
From: Naveen Albert <asterisk@phreaknet.org>
Date: Sat, 5 Feb 2022 21:16:27 +0000
Subject: [PATCH] cli: Fix CLI blocking forever on terminating backslash
A corner case exists in CLI parsing where if
a CLI user in a remote console ends with
a backslash and then invokes command completion
(using TAB or ?), then the console will freeze
forever until a SIGQUIT signal is sent to the
process, due to getting blocked forever
reading the command completion. CTRL+C
and other key combinations have no impact on
the CLI session.
This occurs because, in such cases, the CLI
process is waiting for AST_CLI_COMPLETE_EOF
to appear in the buffer from the main process,
but instead the main process is confused by
the funny syntax and thus prints out the CLI help.
As a result, the CLI process is stuck on the
read call, waiting for the completion that
will never come.
This prevents blocking forever by checking
if the data from the main process starts with
"Usage:". If it does, that means that CLI help
was sent instead of the tab complete vector,
and thus the CLI should bail out and not wait
any longer.
ASTERISK-29822 #close
Change-Id: I9810ac59304fec162da701653c9c834f0ec8f670
---
main/asterisk.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/main/asterisk.c b/main/asterisk.c
index 9d1561e5af..0d6217b605 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3007,6 +3007,23 @@ static char *cli_complete(EditLine *editline, int ch)
/* Only read 1024 bytes at a time */
res = read(ast_consock, mbuf + mlen, 1024);
if (res > 0) {
+ if (!strncmp(mbuf, "Usage:", 6)) {
+ /*
+ * Abort on malformed tab completes
+ * If help (tab complete) follows certain
+ * special characters, the main Asterisk process
+ * provides usage for the internal tab complete
+ * helper command that the remote console processes
+ * use.
+ * If this happens, the AST_CLI_COMPLETE_EOF sentinel
+ * value never gets sent. As a result, we'll just block
+ * forever if we don't handle this case.
+ * If we get command usage on a tab complete, then
+ * we know this scenario just happened and we should
+ * just silently ignore and do nothing.
+ */
+ break;
+ }
mlen += res;
mbuf[mlen] = '\0';
}
--
GitLab