RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 19:52:45 +00:00
Code Issues Activity Actions

LibTLS: "Properly" handle the server dropping the connection

Browse source 
Contrary to popular belief, not every implementation of TLS follows the
specs.
Some of them just drop the connection without sending a proper
close_notify, and we should handle that gracefully.
This commit is contained in:
AnotherTest 2020-05-03 21:26:23 +04:30 • committed by Andreas Kling
parent 8aeccf4f02
commit b028a123b8
3 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Libraries/LibHTTP/HttpsJob.cpp
View file

@ -156,39 +156,49 @@ void HttpsJob::on_socket_connected()
}
ASSERT(m_state == State::InBody);
ASSERT(tls.can_read());
auto payload = tls.read(64 * KB);
if (!payload) {
if (tls.eof())
return finish_up();
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}
m_received_buffers.append(payload);
m_received_size += payload.size();
auto content_length_header = m_headers.get("Content-Length");
Optional<u32> content_length {};
while (tls.can_read())
read_body(tls);
if (content_length_header.has_value()) {
bool ok;
auto length = content_length_header.value().to_uint(ok);
if (ok)
content_length = length;
}
// This needs to be synchronous
// FIXME: Somehow enforce that this should not modify anything
did_progress(content_length, m_received_size);
if (content_length.has_value()) {
auto length = content_length.value();
if (m_received_size >= length) {
m_received_size = length;
finish_up();
}
}
if (!tls.is_established())
return finish_up();
};
}
void HttpsJob::read_body(TLS::TLSv12& tls)
{
auto payload = tls.read(64 * KB);
if (!payload) {
if (tls.eof())
return finish_up();
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}
m_received_buffers.append(payload);
m_received_size += payload.size();
auto content_length_header = m_headers.get("Content-Length");
Optional<u32> content_length {};
if (content_length_header.has_value()) {
bool ok;
auto length = content_length_header.value().to_uint(ok);
if (ok)
content_length = length;
}
// This needs to be synchronous
// FIXME: Somehow enforce that this should not modify anything
did_progress(content_length, m_received_size);
if (content_length.has_value()) {
auto length = content_length.value();
if (m_received_size >= length) {
m_received_size = length;
finish_up();
}
}
}
void HttpsJob::finish_up()
{
m_state = State::Finished;