mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-09 09:39:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb+LibRequests+RequestServer: Report network error on request finish

Browse source 
This allows us to bubble up network errors to API consumers after
finishing a request.
This commit is contained in:
rmg-x 2024-10-09 17:01:34 -05:00 • committed by Sam Atkins
commit ff18114ae7
Notes: github-actions[bot] 2024-10-10 18:57:15 +00:00
9 changed files with 115 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -178,6 +178,30 @@ static void log_filtered_request(LoadRequest const& request)
dbgln("ResourceLoader: Filtered request to: \"{}\"", url_for_logging);
}
static StringView network_error_to_string_view(Requests::NetworkError const& network_error)
{
switch (network_error) {
case Requests::NetworkError::UnableToResolveProxy:
return "Unable to resolve proxy"sv;
case Requests::NetworkError::UnableToResolveHost:
return "Unable to resolve host"sv;
case Requests::NetworkError::UnableToConnect:
return "Unable to connect"sv;
case Requests::NetworkError::TimeoutReached:
return "Timeout reached"sv;
case Requests::NetworkError::TooManyRedirects:
return "Too many redirects"sv;
case Requests::NetworkError::SSLHandshakeFailed:
return "SSL handshake failed"sv;
case Requests::NetworkError::SSLVerificationFailed:
return "SSL verification failed"sv;
case Requests::NetworkError::MalformedUrl:
return "The URL is not formatted properly"sv;
default:
return "An unexpected network error occurred"sv;
}
}
static bool should_block_request(LoadRequest const& request)
{
auto const& url = request.url();
@ -397,16 +421,20 @@ void ResourceLoader::load(LoadRequest& request, SuccessCallback success_callback
timer->start();
}
auto on_buffered_request_finished = [this, success_callback = move(success_callback), error_callback = move(error_callback), request, &protocol_request = *protocol_request](bool success, auto, auto& response_headers, auto status_code, ReadonlyBytes payload) mutable {
auto on_buffered_request_finished = [this, success_callback = move(success_callback), error_callback = move(error_callback), request, &protocol_request = *protocol_request](auto, auto const& network_error, auto& response_headers, auto status_code, ReadonlyBytes payload) mutable {
handle_network_response_headers(request, response_headers);
finish_network_request(protocol_request);
if (!success || (status_code.has_value() && *status_code >= 400 && *status_code <= 599 && (payload.is_empty() || !request.is_main_resource()))) {
if (network_error.has_value() || (status_code.has_value() && *status_code >= 400 && *status_code <= 599 && (payload.is_empty() || !request.is_main_resource()))) {
StringBuilder error_builder;
if (status_code.has_value())
error_builder.appendff("Load failed: {}", *status_code);
if (network_error.has_value())
error_builder.appendff("{}", network_error_to_string_view(*network_error));
else
error_builder.append("Load failed"sv);
if (status_code.has_value())
error_builder.appendff(" (status code: {})", *status_code);
log_failure(request, error_builder.string_view());
if (error_callback)
error_callback(error_builder.to_byte_string(), status_code, payload, response_headers);
@ -460,10 +488,10 @@ void ResourceLoader::load_unbuffered(LoadRequest& request, OnHeadersReceived on_
on_data_received(data);
};
auto protocol_complete = [this, on_complete = move(on_complete), request, &protocol_request = *protocol_request](bool success, u64) {
auto protocol_complete = [this, on_complete = move(on_complete), request, &protocol_request = *protocol_request](u64, Optional<Requests::NetworkError> const& network_error) {
finish_network_request(protocol_request);
if (success) {
if (!network_error.has_value()) {
log_success(request);
on_complete(true, {});
} else {