RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:28:11 +00:00
Code Issues Activity Actions

LibTLS: Avoid busy-wait between ClientHello and ServerHello

Browse source 
This commit also adds a timeout timer to cancel the connection if the
server does not respond to the hello request in 10 seconds.
This commit is contained in:
AnotherTest 2020-05-30 19:53:07 +04:30 • committed by Andreas Kling
parent e5e8e8ab96
commit d54d2892a9
5 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Libraries/LibTLS/Socket.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibCore/DateTime.h>
#include <LibCore/Timer.h>
#include <LibCrypto/ASN1/DER.h>
#include <LibCrypto/PK/Code/EMSA_PSS.h>
@ -110,14 +111,32 @@ bool TLSv12::common_connect(const struct sockaddr* saddr, socklen_t length)
}
}
auto packet = build_hello();
write_packet(packet);
Core::Socket::on_connected = [this] {
Core::Socket::on_ready_to_read = [this] {
read_from_socket();
};
write_into_socket();
auto packet = build_hello();
write_packet(packet);
deferred_invoke([&](auto&) {
m_handshake_timeout_timer = Core::Timer::create_single_shot(
m_max_wait_time_for_handshake_in_seconds * 1000, [&] {
// The server did not respond fast enough,
// time the connection out.
alert(AlertLevel::Critical, AlertDescription::UserCanceled);
m_context.connection_finished = true;
m_context.tls_buffer.clear();
m_context.error_code = Error::TimedOut;
m_context.critical_error = (u8)Error::TimedOut;
check_connection_state(false); // Notify the client.
},
this);
write_into_socket();
m_handshake_timeout_timer->start();
});
m_has_scheduled_write_flush = true;
if (on_tls_connected)
on_tls_connected();
};
@ -138,7 +157,7 @@ void TLSv12::read_from_socket()
if (!check_connection_state(true))
return;
flush();
consume(Core::Socket::read(4096));
}
@ -152,13 +171,10 @@ void TLSv12::write_into_socket()
return;
flush();
if (!is_established()) {
deferred_invoke([this](auto&) { write_into_socket(); });
m_has_scheduled_write_flush = true;
if (!is_established())
return;
}
if (is_established() && !m_context.application_buffer.size()) // hey client, you still have stuff to read...
if (!m_context.application_buffer.size()) // hey client, you still have stuff to read...
if (on_tls_ready_to_write)
on_tls_ready_to_write(*this);
}