From a447a25a9d779693e329cd743309b067a5ab1c00 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Thu, 20 Jun 2024 15:17:05 +0200
Subject: [PATCH] Strict parsing in Keeper client

---
 programs/keeper-client/Parser.cpp             |  5 ++++
 ...lickhouse_keeper_client_no_confirmation.sh |  8 +++---
 .../02883_zookeeper_finalize_stress.sh        |  2 +-
 .../03135_keeper_client_find_commands.sh      | 28 +++++++++----------
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/programs/keeper-client/Parser.cpp b/programs/keeper-client/Parser.cpp
index 2c8adee53e4..51f85cf4a69 100644
--- a/programs/keeper-client/Parser.cpp
+++ b/programs/keeper-client/Parser.cpp
@@ -12,6 +12,11 @@ bool parseKeeperArg(IParser::Pos & pos, Expected & expected, String & result)
         if (!parseIdentifierOrStringLiteral(pos, expected, result))
             return false;
     }
+    else if (pos->type == TokenType::Number)
+    {
+        result.append(pos->begin, pos->end);
+        ++pos;
+    }
 
     ParserToken{TokenType::Whitespace}.ignore(pos);
 
diff --git a/tests/queries/0_stateless/02882_clickhouse_keeper_client_no_confirmation.sh b/tests/queries/0_stateless/02882_clickhouse_keeper_client_no_confirmation.sh
index 4bda0cfa5b0..43f86b8a58a 100755
--- a/tests/queries/0_stateless/02882_clickhouse_keeper_client_no_confirmation.sh
+++ b/tests/queries/0_stateless/02882_clickhouse_keeper_client_no_confirmation.sh
@@ -6,8 +6,8 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 path="/test-keeper-client-$CLICKHOUSE_DATABASE"
 
-$CLICKHOUSE_KEEPER_CLIENT -q "rm $path" >& /dev/null
+$CLICKHOUSE_KEEPER_CLIENT -q "rm '$path'" >& /dev/null
 
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "rmr $path"
-$CLICKHOUSE_KEEPER_CLIENT -q "get $path" 2>&1
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "rmr '$path'"
+$CLICKHOUSE_KEEPER_CLIENT -q "get '$path'" 2>&1
diff --git a/tests/queries/0_stateless/02883_zookeeper_finalize_stress.sh b/tests/queries/0_stateless/02883_zookeeper_finalize_stress.sh
index dc7d67fbdd4..c883cd8f58a 100755
--- a/tests/queries/0_stateless/02883_zookeeper_finalize_stress.sh
+++ b/tests/queries/0_stateless/02883_zookeeper_finalize_stress.sh
@@ -7,4 +7,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-yes /keeper/api_version | head -n1000 | xargs -P30 -i $CLICKHOUSE_KEEPER_CLIENT -q 'get {}' > /dev/null
+yes /keeper/api_version | head -n1000 | xargs -P30 -i $CLICKHOUSE_KEEPER_CLIENT -q "get '{}'" > /dev/null
diff --git a/tests/queries/0_stateless/03135_keeper_client_find_commands.sh b/tests/queries/0_stateless/03135_keeper_client_find_commands.sh
index 0f57694028d..43ffdec7346 100755
--- a/tests/queries/0_stateless/03135_keeper_client_find_commands.sh
+++ b/tests/queries/0_stateless/03135_keeper_client_find_commands.sh
@@ -6,24 +6,24 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 path="/test-keeper-client-$CLICKHOUSE_DATABASE"
 
-$CLICKHOUSE_KEEPER_CLIENT -q "rm $path" >& /dev/null
+$CLICKHOUSE_KEEPER_CLIENT -q "rm '$path'" >& /dev/null
 
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/a 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/a/a 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/b 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/c 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/d 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/d/a 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/d/b 'foobar'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create $path/1/d/c 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/a' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/a/a' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/b' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/c' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/d' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/d/a' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/d/b' 'foobar'"
+$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/1/d/c' 'foobar'"
 
 echo 'find_super_nodes'
 $CLICKHOUSE_KEEPER_CLIENT -q "find_super_nodes 1000000000"
-$CLICKHOUSE_KEEPER_CLIENT -q "find_super_nodes 3 $path" | sort
+$CLICKHOUSE_KEEPER_CLIENT -q "find_super_nodes 3 '$path'" | sort
 
 echo 'find_big_family'
-$CLICKHOUSE_KEEPER_CLIENT -q "find_big_family $path 3"
+$CLICKHOUSE_KEEPER_CLIENT -q "find_big_family '$path' 3"
 
-$CLICKHOUSE_KEEPER_CLIENT -q "rmr $path"
+$CLICKHOUSE_KEEPER_CLIENT -q "rmr '$path'"