thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-19 04:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

potentially very serious bug is fixed for secure socket

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2024-06-14 01:35:08 +00:00
parent fb49cf503e
commit ba76a06f56
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/IO/ReadBufferFromPocoSocket.cpp
View File

@ -134,11 +134,14 @@ ReadBufferFromPocoSocketBase::ReadBufferFromPocoSocketBase(Poco::Net::Socket & s
bool ReadBufferFromPocoSocketBase::poll(size_t timeout_microseconds) const bool ReadBufferFromPocoSocketBase::poll(size_t timeout_microseconds) const
{ {
if (available()) /// For secure socket it is important to check if any remaining data available in underlying decryption buffer -
/// read always retrives the whole encrypted frame from the wire and puts it into underlying buffer while returning only requested size -
/// further poll() can block though there is still data to read in the underlying decryption buffer.
if (available() || socket.impl()->available())
return true; return true;
Stopwatch watch; Stopwatch watch;
bool res = socket.poll(timeout_microseconds, Poco::Net::Socket::SELECT_READ | Poco::Net::Socket::SELECT_ERROR); bool res = socket.impl()->poll(timeout_microseconds, Poco::Net::Socket::SELECT_READ | Poco::Net::Socket::SELECT_ERROR);
ProfileEvents::increment(ProfileEvents::NetworkReceiveElapsedMicroseconds, watch.elapsedMicroseconds()); ProfileEvents::increment(ProfileEvents::NetworkReceiveElapsedMicroseconds, watch.elapsedMicroseconds());
return res; return res;
} }