summaryrefslogtreecommitdiff
path: root/Userland/Utilities
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-03-16 17:29:29 +0330
committerAndreas Kling <kling@serenityos.org>2022-03-19 22:04:35 +0100
commitadff9a96a672146a0be617cac5d06fbb602f52bd (patch)
tree614d472cb66a6369f61a6d7611b095153d75a98f /Userland/Utilities
parentb172bf4f842081f33c06c675b353de07b3fbcbaf (diff)
downloadserenity-adff9a96a672146a0be617cac5d06fbb602f52bd.zip
pro: Optionally follow 3xx responses with a Location header
This is not enabled by default, and can be enabled by passing `-l`. Fixes #12714.
Diffstat (limited to 'Userland/Utilities')
-rw-r--r--Userland/Utilities/pro.cpp168
1 files changed, 103 insertions, 65 deletions
diff --git a/Userland/Utilities/pro.cpp b/Userland/Utilities/pro.cpp
index 7307699fc3..97adc334bb 100644
--- a/Userland/Utilities/pro.cpp
+++ b/Userland/Utilities/pro.cpp
@@ -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,95 +190,131 @@ 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 };
- request->on_progress = [&](Optional<u32> maybe_total_size, u32 downloaded_size) {
- warn("\r\033[2K");
- if (maybe_total_size.has_value()) {
- warn("\033]9;{};{};\033\\", downloaded_size, maybe_total_size.value());
- warn("Download progress: {} / {}", human_readable_size(downloaded_size), human_readable_size(maybe_total_size.value()));
- } else {
- warn("Download progress: {} / ???", human_readable_size(downloaded_size));
+ 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());
+ warn("Download progress: {} / {}", human_readable_size(downloaded_size), human_readable_size(maybe_total_size.value()));
+ } else {
+ warn("Download progress: {} / ???", human_readable_size(downloaded_size));
+ }
- gettimeofday(&current_time, nullptr);
- timersub(&current_time, &prev_time, &time_diff);
-
- auto time_diff_ms = time_diff.tv_sec * 1000 + time_diff.tv_usec / 1000;
- auto size_diff = downloaded_size - previous_downloaded_size;
+ gettimeofday(&current_time, nullptr);
+ timersub(&current_time, &prev_time, &time_diff);
- warn(" at {}/s", human_readable_size(((float)size_diff / (float)time_diff_ms) * 1000));
+ auto time_diff_ms = time_diff.tv_sec * 1000 + time_diff.tv_usec / 1000;
+ auto size_diff = downloaded_size - previous_downloaded_size;
- if (time_diff_ms >= download_speed_rolling_average_time_in_ms) {
- previous_downloaded_size = previous_midpoint_downloaded_size;
- prev_time = prev_midpoint_time;
- } else if (time_diff_ms >= download_speed_rolling_average_time_in_ms / 2) {
- previous_midpoint_downloaded_size = downloaded_size;
- prev_midpoint_time = current_time;
- }
- };
+ warn(" at {}/s", human_readable_size(((float)size_diff / (float)time_diff_ms) * 1000));
- if (save_at_provided_name) {
+ if (time_diff_ms >= download_speed_rolling_average_time_in_ms) {
+ previous_downloaded_size = previous_midpoint_downloaded_size;
+ prev_time = prev_midpoint_time;
+ } else if (time_diff_ms >= download_speed_rolling_average_time_in_ms / 2) {
+ previous_midpoint_downloaded_size = downloaded_size;
+ prev_midpoint_time = current_time;
+ }
+ };
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!
- String output_name;
- if (auto content_disposition = response_headers.get("Content-Disposition"); content_disposition.has_value()) {
- auto& value = content_disposition.value();
- ContentDispositionParser parser(value);
- output_name = parser.filename();
- }
+ 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();
+ ContentDispositionParser parser(value);
+ output_name = parser.filename();
+ }
- if (output_name.is_empty())
- output_name = url.path();
-
- LexicalPath path { output_name };
- output_name = path.basename();
-
- // The URL didn't have a name component, e.g. 'serenityos.org'
- if (output_name.is_empty() || output_name == "/") {
- int i = -1;
- do {
- output_name = url.host();
- if (i > -1)
- output_name = String::formatted("{}.{}", output_name, i);
- ++i;
- } while (Core::File::exists(output_name));
+ if (output_name.is_empty())
+ output_name = url.path();
+
+ LexicalPath path { output_name };
+ output_name = path.basename();
+
+ // The URL didn't have a name component, e.g. 'serenityos.org'
+ if (output_name.is_empty() || output_name == "/") {
+ int i = -1;
+ do {
+ output_name = url.host();
+ if (i > -1)
+ output_name = String::formatted("{}.{}", output_name, i);
+ ++i;
+ } while (Core::File::exists(output_name));
+ }
+
+ if (freopen(output_name.characters(), "w", stdout) == nullptr) {
+ perror("freopen");
+ loop.quit(1);
+ return;
+ }
}
- if (freopen(output_name.characters(), "w", stdout) == nullptr) {
- perror("freopen");
- 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) {
- warn("\033]9;-1;\033\\");
- warnln();
- if (!success)
- warnln("Request failed :(");
- loop.quit(0);
+ request->on_finish = [&](bool success, auto) {
+ dbgln("Request {}, on finish", request->id());
+ if (following_url)
+ return;
+
+ warn("\033]9;-1;\033\\");
+ warnln();
+ if (!success)
+ warnln("Request failed :(");
+ loop.quit(0);
+ };
+
+ request->stream_into(output_stream);
};
- 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());