From 2489abf9cb3be66a5ba9b16786225affc1c65ddc Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Sun, 2 Feb 2020 17:01:31 -0800
Subject: [PATCH] connui: accommodate multi-line 2fac prompts

This fixes up the cursor position when the remote host sends
a multi-line prompt.
---
 src/connui.rs | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/connui.rs b/src/connui.rs
index b8e4c1c7809..004c1ef4f1b 100644
--- a/src/connui.rs
+++ b/src/connui.rs
@@ -163,13 +163,33 @@ impl ConnectionUI {
         self.output(vec![Change::Text(s)]);
     }
 
+    /// Crack a multi-line prompt into an optional preamble and the prompt
+    /// text on the final line.  This is needed because the line editor
+    /// is only designed for a single line prompt; a multi-line prompt
+    /// messes up the cursor positioning.
+    fn split_multi_line_prompt(s: &str) -> (Option<String>, String) {
+        let text = s.replace("\n", "\r\n");
+        let bits: Vec<&str> = text.rsplitn(2, "\r\n").collect();
+
+        if bits.len() == 2 {
+            (Some(format!("{}\r\n", bits[1])), bits[0].to_owned())
+        } else {
+            (None, text)
+        }
+    }
+
     pub fn input(&self, prompt: &str) -> anyhow::Result<String> {
         let mut promise = Promise::new();
         let future = promise.get_future().unwrap();
 
+        let (preamble, prompt) = Self::split_multi_line_prompt(prompt);
+        if let Some(preamble) = preamble {
+            self.output(vec![Change::Text(preamble)]);
+        }
+
         self.tx
             .send(UIRequest::Input {
-                prompt: prompt.replace("\n", "\r\n"),
+                prompt,
                 echo: true,
                 respond: promise,
             })
@@ -182,9 +202,14 @@ impl ConnectionUI {
         let mut promise = Promise::new();
         let future = promise.get_future().unwrap();
 
+        let (preamble, prompt) = Self::split_multi_line_prompt(prompt);
+        if let Some(preamble) = preamble {
+            self.output(vec![Change::Text(preamble)]);
+        }
+
         self.tx
             .send(UIRequest::Input {
-                prompt: prompt.replace("\n", "\r\n"),
+                prompt,
                 echo: false,
                 respond: promise,
             })