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

Tests: Rework TLS test to use new cacert.pem

Browse source
This commit is contained in:
Fabian Dellwing 2023-03-14 14:13:37 +01:00 • committed by Ali Mohammad Pur
parent b07654c3c1
commit da6130a6d8
2 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Tests/LibTLS/TestTLSHandshake.cpp
View file

@ -9,10 +9,11 @@
#include <LibCore/DeprecatedFile.h> #include <LibCore/DeprecatedFile.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCrypto/ASN1/ASN1.h> #include <LibCrypto/ASN1/ASN1.h>
#include <LibCrypto/ASN1/PEM.h>
#include <LibTLS/TLSv12.h> #include <LibTLS/TLSv12.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
static StringView ca_certs_file = "./ca_certs.ini"sv; static StringView ca_certs_file = "./cacert.pem"sv;
static int port = 443; static int port = 443;
constexpr auto DEFAULT_SERVER = "www.google.com"sv; constexpr auto DEFAULT_SERVER = "www.google.com"sv;
@ -30,7 +31,7 @@ DeprecatedString locate_ca_certs_file()
if (Core::DeprecatedFile::exists(ca_certs_file)) { if (Core::DeprecatedFile::exists(ca_certs_file)) {
return ca_certs_file; return ca_certs_file;
} }
auto on_target_path = DeprecatedString("/etc/ca_certs.ini"); auto on_target_path = DeprecatedString("/etc/cacert.pem");
if (Core::DeprecatedFile::exists(on_target_path)) { if (Core::DeprecatedFile::exists(on_target_path)) {
return on_target_path; return on_target_path;
} }
@ -40,33 +41,41 @@ DeprecatedString locate_ca_certs_file()
Vector<Certificate> load_certificates() Vector<Certificate> load_certificates()
{ {
Vector<Certificate> certificates; Vector<Certificate> certificates;
auto ca_certs_filepath = locate_ca_certs_file();
if (ca_certs_filepath == "") { auto cacert_result = Core::File::open(locate_ca_certs_file(), Core::File::OpenMode::Read);
warnln("Could not locate ca_certs.ini file."); if (cacert_result.is_error()) {
dbgln("Failed to load CA Certificates: {}", cacert_result.error());
return certificates; return certificates;
} }
auto cacert_file = cacert_result.release_value();
auto config = Core::ConfigFile::open(ca_certs_filepath).release_value_but_fixme_should_propagate_errors(); auto data_result = cacert_file->read_until_eof();
for (auto& entity : config->groups()) { if (data_result.is_error()) {
for (auto& subject : config->keys(entity)) { dbgln("Failed to load CA Certificates: {}", data_result.error());
auto certificate_base64 = config->read_entry(entity, subject); return certificates;
auto certificate_data_result = decode_base64(certificate_base64);
if (certificate_data_result.is_error()) {
dbgln("Skipping CA Certificate {} {}: out of memory", entity, subject);
continue;
}
auto certificate_data = certificate_data_result.release_value();
auto certificate_result = Certificate::parse_asn1(certificate_data.bytes());
// If the certificate does not parse it is likely using elliptic curve keys/signatures, which are not
// supported right now. Currently, ca_certs.ini should only contain certificates with RSA keys/signatures.
if (!certificate_result.has_value()) {
dbgln("Skipping CA Certificate {} {}: unable to parse", entity, subject);
continue;
}
auto certificate = certificate_result.release_value();
certificates.append(move(certificate));
}
} }
auto data = data_result.release_value();
auto decode_result = Crypto::decode_pems(data);
if (decode_result.is_error()) {
dbgln("Failed to load CA Certificates: {}", decode_result.error());
return certificates;
}
auto certs = decode_result.release_value();
for (auto& cert : certs) {
auto certificate_result = Certificate::parse_asn1(cert.bytes());
// If the certificate does not parse it is likely using elliptic curve keys/signatures, which are not
// supported right now. It might make sense to cleanup cacert.pem before adding it to the system.
if (!certificate_result.has_value()) {
// FIXME: It would be nice to have more informations about the certificate we failed to parse.
// Like: Issuer, Algorithm, CN, etc
continue;
}
auto certificate = certificate_result.release_value();
if (certificate.is_certificate_authority)
certificates.append(move(certificate));
}
return certificates; return certificates;
} }

1
Tests/LibTLS/ca_certs.ini
View file

@ -1 +0,0 @@
../../Base/etc/ca_certs.ini