thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close interserver connection on exception that happened before first authentication

Browse Source
This commit is contained in:
Antonio Andelic 2023-11-23 11:41:14 +00:00
parent 4ed4fbe74d
commit 953a8d774a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Server/TCPHandler.cpp
View File

@ -690,6 +690,13 @@ void TCPHandler::runImpl()
LOG_WARNING(log, "Client has gone away."); LOG_WARNING(log, "Client has gone away.");
} }
/// Interserver authentication is done only after we read the query.
/// This fact can be abused by producing exception before or while we read the query.
/// To aovid any potential exploits, we simply close connection on any exceptions
/// that happen before the first query is authenticated with the cluster secret.
if (is_interserver_mode && exception && !is_interserver_authenticated)
exception->rethrow();
try try
{ {
/// A query packet is always followed by one or more data packets. /// A query packet is always followed by one or more data packets.
@ -1797,6 +1804,8 @@ void TCPHandler::receiveQuery()
/// address. /// address.
session->authenticate(AlwaysAllowCredentials{client_info.initial_user}, client_info.initial_address); session->authenticate(AlwaysAllowCredentials{client_info.initial_user}, client_info.initial_address);
} }
is_interserver_authenticated = true;
#else #else
auto exception = Exception(ErrorCodes::AUTHENTICATION_FAILED, auto exception = Exception(ErrorCodes::AUTHENTICATION_FAILED,
"Inter-server secret support is disabled, because ClickHouse was built without SSL library"); "Inter-server secret support is disabled, because ClickHouse was built without SSL library");

1
src/Server/TCPHandler.h
View File

@ -200,6 +200,7 @@ private:
bool is_ssh_based_auth = false; bool is_ssh_based_auth = false;
/// For inter-server secret (remote_server.*.secret) /// For inter-server secret (remote_server.*.secret)
bool is_interserver_mode = false; bool is_interserver_mode = false;
bool is_interserver_authenticated = false;
/// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET /// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET
String salt; String salt;
/// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2 /// For DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2