RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:57:45 +00:00
Code Issues Activity Actions

Tests+LibTLS: Use TRY_OR_FAIL for TestTLSHandshake

Browse source
This commit is contained in:
Fabian Dellwing 2023-04-10 15:57:38 +02:00 • committed by Tim Flynn
parent 48d5cde299
commit 550635164d
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Tests/LibTLS/TestTLSHandshake.cpp
View file

@ -23,7 +23,7 @@ static ByteBuffer operator""_b(char const* string, size_t length)
return ByteBuffer::copy(string, length).release_value(); return ByteBuffer::copy(string, length).release_value();
} }
Vector<Certificate> load_certificates(); ErrorOr<Vector<Certificate>> load_certificates();
DeprecatedString locate_ca_certs_file(); DeprecatedString locate_ca_certs_file();
DeprecatedString locate_ca_certs_file() DeprecatedString locate_ca_certs_file()
@ -38,20 +38,18 @@ DeprecatedString locate_ca_certs_file()
return ""; return "";
} }
Vector<Certificate> load_certificates() ErrorOr<Vector<Certificate>> load_certificates()
{ {
auto cacert_file = MUST(Core::File::open(locate_ca_certs_file(), Core::File::OpenMode::Read)); auto cacert_file = TRY(Core::File::open(locate_ca_certs_file(), Core::File::OpenMode::Read));
auto data = MUST(cacert_file->read_until_eof()); auto data = TRY(cacert_file->read_until_eof());
return MUST(DefaultRootCACertificates::the().reload_certificates(data)); return TRY(DefaultRootCACertificates::the().reload_certificates(data));
} }
static Vector<Certificate> s_root_ca_certificates = load_certificates();
TEST_CASE(test_TLS_hello_handshake) TEST_CASE(test_TLS_hello_handshake)
{ {
Core::EventLoop loop; Core::EventLoop loop;
TLS::Options options; TLS::Options options;
options.set_root_certificates(s_root_ca_certificates); options.set_root_certificates(TRY_OR_FAIL(load_certificates()));
options.set_alert_handler([&](TLS::AlertDescription) { options.set_alert_handler([&](TLS::AlertDescription) {
FAIL("Connection failure"); FAIL("Connection failure");
loop.quit(1); loop.quit(1);
@ -60,10 +58,10 @@ TEST_CASE(test_TLS_hello_handshake)
loop.quit(0); loop.quit(0);
}); });
auto tls = MUST(TLS::TLSv12::connect(DEFAULT_SERVER, port, move(options))); auto tls = TRY_OR_FAIL(TLS::TLSv12::connect(DEFAULT_SERVER, port, move(options)));
ByteBuffer contents; ByteBuffer contents;
tls->on_ready_to_read = [&] { tls->on_ready_to_read = [&] {
auto read_bytes = MUST(tls->read_some(contents.must_get_bytes_for_writing(4 * KiB))); auto read_bytes = TRY_OR_FAIL(tls->read_some(contents.must_get_bytes_for_writing(4 * KiB)));
if (read_bytes.is_empty()) { if (read_bytes.is_empty()) {
FAIL("No data received"); FAIL("No data received");
loop.quit(1); loop.quit(1);