Remove "current_password" because it is harmful

alexey-milovidov · alexey-milovidov · commit 66ccb2f6b121 · 2020-06-15T04:12:01.000+03:00
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
@@ -47,8 +47,6 @@ class ClientInfo
     String current_user;
     String current_query_id;
     Poco::Net::SocketAddress current_address;
-    /// Use current user and password when sending query to replica leader
-    String current_password;
 
     /// When query_kind == INITIAL_QUERY, these values are equal to current.
     String initial_user;
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
@@ -660,7 +660,6 @@ void Context::setUser(const String & name, const String & password, const Poco::
     auto lock = getLock();
 
     client_info.current_user = name;
-    client_info.current_password = password;
     client_info.current_address = address;
 
     auto new_user_id = getAccessControlManager().find<User>(name);
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -4416,7 +4416,7 @@ void StorageReplicatedMergeTree::sendRequestToLeaderReplica(const ASTPtr & query
     const auto & query_settings = query_context.getSettingsRef();
     const auto & query_client_info = query_context.getClientInfo();
     String user = query_client_info.current_user;
-    String password = query_client_info.current_password;
+    String password;
 
     if (auto address = findClusterAddress(leader_address); address)
     {
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
@@ -222,6 +222,7 @@ class StorageReplicatedMergeTree final : public ext::shared_ptr_helper<StorageRe
     zkutil::EphemeralNodeHolderPtr replica_is_active_node;
 
     /** Is this replica "leading". The leader replica selects the parts to merge.
+      * It can be false only when old ClickHouse versions are working on the same cluster, because now we allow multiple leaders.
       */
     std::atomic<bool> is_leader {false};
     zkutil::LeaderElectionPtr leader_election;
@@ -497,6 +498,7 @@ class StorageReplicatedMergeTree final : public ext::shared_ptr_helper<StorageRe
     bool waitForReplicaToProcessLogEntry(const String & replica_name, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active = true);
 
     /// Choose leader replica, send requst to it and wait.
+    /// Only makes sense when old ClickHouse versions are working on the same cluster, because now we allow multiple leaders.
     void sendRequestToLeaderReplica(const ASTPtr & query, const Context & query_context);
 
     /// Throw an exception if the table is readonly.

Original file line number	Diff line number	Diff line change
`@@ -4416,7 +4416,7 @@ void StorageReplicatedMergeTree::sendRequestToLeaderReplica(const ASTPtr & query`
`4416`	`4416`	`const auto & query_settings = query_context.getSettingsRef();`
`4417`	`4417`	`const auto & query_client_info = query_context.getClientInfo();`
`4418`	`4418`	`String user = query_client_info.current_user;`
`4419`		`- String password = query_client_info.current_password;`
	`4419`	`+ String password;`
`4420`	`4420`
`4421`	`4421`	`if (auto address = findClusterAddress(leader_address); address)`
`4422`	`4422`	`{`