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

pro: Optionally follow 3xx responses with a Location header

Browse source 
This is not enabled by default, and can be enabled by passing `-l`.
Fixes #12714.
This commit is contained in:
Ali Mohammad Pur 2022-03-16 17:29:29 +03:30 • committed by Andreas Kling
parent b172bf4f84
commit adff9a96a6
1 changed files with 102 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Userland/Utilities/pro.cpp
View file

@ -149,6 +149,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
{
const char* url_str = nullptr;
bool save_at_provided_name = false;
bool should_follow_url = false;
const char* data = nullptr;
String method = "GET";
HashMap<String, String, CaseInsensitiveStringTraits> request_headers;
@ -159,6 +160,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
"and thus supports at least http, https, and gemini.");
args_parser.add_option(save_at_provided_name, "Write to a file named as the remote file", nullptr, 'O');
args_parser.add_option(data, "(HTTP only) Send the provided data via an HTTP POST request", "data", 'd', "data");
args_parser.add_option(should_follow_url, "(HTTP only) Follow the Location header if a 3xx status is encountered", "follow", 'l');
args_parser.add_option(Core::ArgsParser::Option {
.requires_argument = true,
.help_string = "Add a header entry to the request",
@ -188,23 +190,28 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
Core::EventLoop loop;
auto protocol_client = TRY(Protocol::RequestClient::try_create());
auto request = protocol_client->start_request(method, url, request_headers, data ? StringView { data }.bytes() : ReadonlyBytes {});
if (!request) {
warnln("Failed to start request for '{}'", url_str);
return 1;
}
bool received_actual_headers = false;
bool should_save_stream_data = false;
bool following_url = false;
u32 previous_downloaded_size { 0 };
u32 previous_midpoint_downloaded_size { 0 };
timeval prev_time, prev_midpoint_time, current_time, time_diff;
static constexpr auto download_speed_rolling_average_time_in_ms = 4000;
gettimeofday(&prev_time, nullptr);
bool received_actual_headers = false;
RefPtr<Protocol::Request> request;
auto protocol_client = TRY(Protocol::RequestClient::try_create());
auto output_stream = ConditionalOutputFileStream { [&] { return should_save_stream_data; }, stdout };
Function<void()> setup_request = [&] {
if (!request) {
warnln("Failed to start request for '{}'", url_str);
exit(1);
}
dbgln("Request {}, setup", request->id());
request->on_progress = [&](Optional<u32> maybe_total_size, u32 downloaded_size) {
dbgln("Request {}, on progress", request->id());
warn("\r\033[2K");
if (maybe_total_size.has_value()) {
warn("\033]9;{};{};\033\\", downloaded_size, maybe_total_size.value());
@ -229,13 +236,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
prev_midpoint_time = current_time;
}
};
if (save_at_provided_name) {
request->on_headers_received = [&](auto& response_headers, auto status_code) {
dbgln("Request {}, on headers", request->id());
if (received_actual_headers)
return;
dbgln("Received headers! response code = {}", status_code.value_or(0));
received_actual_headers = true; // And not trailers!
should_save_stream_data = true;
if (!following_url && save_at_provided_name) {
String output_name;
if (auto content_disposition = response_headers.get("Content-Disposition"); content_disposition.has_value()) {
auto& value = content_disposition.value();
@ -265,9 +274,35 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
loop.quit(1);
return;
}
};
}
auto status_code_value = status_code.value_or(0);
if (should_follow_url && status_code_value >= 300 && status_code_value < 400) {
if (auto location = response_headers.get("Location"); location.has_value()) {
auto was_following_url = following_url;
following_url = true;
received_actual_headers = false;
should_save_stream_data = false;
request->on_finish = nullptr;
request->on_headers_received = nullptr;
request->on_progress = nullptr;
request->stop();
Core::deferred_invoke([&, was_following_url, url = location.value()] {
warnln("{}Following to {}", was_following_url ? "" : "\n", url);
request = protocol_client->start_request(method, url, request_headers, ReadonlyBytes {});
setup_request();
});
}
} else {
following_url = false;
}
};
request->on_finish = [&](bool success, auto) {
dbgln("Request {}, on finish", request->id());
if (following_url)
return;
warn("\033]9;-1;\033\\");
warnln();
if (!success)
@ -275,8 +310,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
loop.quit(0);
};
auto output_stream = ConditionalOutputFileStream { [&] { return save_at_provided_name ? received_actual_headers : true; }, stdout };
request->stream_into(output_stream);
};
request = protocol_client->start_request(method, url, request_headers, data ? StringView { data }.bytes() : ReadonlyBytes {});
setup_request();
dbgln("started request with id {}", request->id());