Fix bracketed-paste mode messing up password input in client reconnect

src/Client/ClientBase.cpp

@@ -7,6 +7,7 @@
 
 #include <base/argsToConfig.h>
 #include <base/safeExit.h>
+#include <base/scope_guard.h>
 #include <Core/Block.h>
 #include <Core/Protocol.h>
 #include <Common/DateLUT.h>
@@ -2219,9 +2220,6 @@ void ClientBase::runInteractive()
     LineReader lr(history_file, config().has("multiline"), query_extenders, query_delimiters);
 #endif
 
-    /// Enable bracketed-paste-mode so that we are able to paste multiline queries as a whole.
-    lr.enableBracketedPaste();
-
     static const std::initializer_list<std::pair<String, String>> backslash_aliases =
         {
             { "\\l", "SHOW DATABASES" },
@@ -2239,7 +2237,18 @@ void ClientBase::runInteractive()
 
     do
     {
-        auto input = lr.readLine(prompt(), ":-] ");
+        String input;
+        {
+            /// Enable bracketed-paste-mode so that we are able to paste multiline queries as a whole.
+            /// But keep it disabled outside of query input, because it breaks password input
+            /// (e.g. if we need to reconnect and show a password prompt).
+            /// (Alternatively, we could make the password input ignore the control sequences.)
+            lr.enableBracketedPaste();
+            SCOPE_EXIT({ lr.disableBracketedPaste(); });
+
+            input = lr.readLine(prompt(), ":-] ");
+        }
+
         if (input.empty())
             break;
 

src/Client/LineReader.h

@@ -46,7 +46,10 @@ class LineReader
     /// clickhouse-client so that without -m flag, one can still paste multiline queries, and
     /// possibly get better pasting performance. See https://cirw.in/blog/bracketed-paste for
     /// more details.
+    /// These methods (if implemented) emit the control characters immediately, without waiting
+    /// for the next readLine() call.
     virtual void enableBracketedPaste() {}
+    virtual void disableBracketedPaste() {}
 
 protected:
     enum InputStatus

src/Client/ReplxxLineReader.cpp

@@ -519,4 +519,10 @@ void ReplxxLineReader::enableBracketedPaste()
     rx.enable_bracketed_paste();
 }
 
+void ReplxxLineReader::disableBracketedPaste()
+{
+    bracketed_paste_enabled = false;
+    rx.disable_bracketed_paste();
+}
+
 }

src/Client/ReplxxLineReader.h

@@ -19,6 +19,7 @@ class ReplxxLineReader : public LineReader
     ~ReplxxLineReader() override;
 
     void enableBracketedPaste() override;
+    void disableBracketedPaste() override;
 
     /// If highlight is on, we will set a flag to denote whether the last token is a delimiter.
     /// This is useful to determine the behavior of <ENTER> key when multiline is enabled.