beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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
Notes: sideshowbarker 2024-07-19 07:00:54 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/b028a123b8c
Pull-request: https://github.com/SerenityOS/serenity/pull/2086
3 changed files with 42 additions and 30 deletions
Show stats 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;

2
Libraries/LibHTTP/HttpsJob.h
View file

@ -50,6 +50,7 @@ private:
RefPtr<TLS::TLSv12> construct_socket() { return TLS::TLSv12::construct(this); }
void on_socket_connected();
void finish_up();
void read_body(TLS::TLSv12&);
enum class State {
InStatus,
@ -66,6 +67,7 @@ private:
Vector<ByteBuffer> m_received_buffers;
size_t m_received_size { 0 };
bool m_sent_data { false };
bool m_queued_finish { false };
};
}

4
Libraries/LibTLS/Socket.cpp
View file

@ -113,7 +113,7 @@ bool TLSv12::common_connect(const struct sockaddr* saddr, socklen_t length)
Core::Socket::on_connected = [this] {
Core::Socket::on_ready_to_read = [this] {
if (!Core::Socket::is_open()) {
if (!Core::Socket::is_open() || !Core::Socket::is_connected() || Core::Socket::eof()) {
// an abrupt closure (the server is a jerk)
dbg() << "Socket not open, assuming abrupt closure";
m_context.connection_finished = true;
@ -143,7 +143,7 @@ bool TLSv12::common_connect(const struct sockaddr* saddr, socklen_t length)
on_tls_ready_to_read(*this);
};
Core::Socket::on_ready_to_write = [this] {
if (!Core::Socket::is_open()) {
if (!Core::Socket::is_open() || !Core::Socket::is_connected() || Core::Socket::eof()) {
// an abrupt closure (the server is a jerk)
dbg() << "Socket not open, assuming abrupt closure";
m_context.connection_finished = true;