From ecb9783f4e1e8761b1530eee78f2b192cf354c9d Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 1 Jan 2025 01:15:11 -0600 Subject: [PATCH] refactor --- .../src/providers/s3/s3_provider.cpp | 85 ++++++++----------- 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp index 5a97f362..cbfe24a6 100644 --- a/repertory/librepertory/src/providers/s3/s3_provider.cpp +++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp @@ -40,9 +40,9 @@ #include "utils/time.hpp" namespace { -[[nodiscard]] auto set_request_path(auto &request, - const std::string &object_name) - -> repertory::api_error { +[[nodiscard]] auto +set_request_path(auto &request, + const std::string &object_name) -> repertory::api_error { request.path = object_name; if (request.path.substr(1U).size() > repertory::max_s3_object_name_length) { return repertory::api_error::name_too_long; @@ -56,9 +56,8 @@ namespace repertory { s3_provider::s3_provider(app_config &config, i_http_comm &comm) : base_provider(config, comm) {} -auto s3_provider::add_if_not_found(api_file &file, - const std::string &object_name) const - -> api_error { +auto s3_provider::add_if_not_found( + api_file &file, const std::string &object_name) const -> api_error { api_meta_map meta{}; auto res = get_item_meta(file.api_path, meta); if (res == api_error::item_not_found) { @@ -85,7 +84,7 @@ auto s3_provider::convert_api_date(std::string_view date) -> std::uint64_t { utils::string::split(date_parts.at(1U), 'Z', true).at(0U)) * 1000000UL; - struct tm tm1{}; + struct tm tm1 {}; #if defined(_WIN32) utils::time::strptime(date_time.c_str(), "%Y-%m-%dT%T", &tm1); return nanos + utils::time::windows_time_t_to_unix_time(_mkgmtime(&tm1)); @@ -160,9 +159,8 @@ auto s3_provider::create_directory_impl(const std::string &api_path, return api_error::success; } -auto s3_provider::create_directory_paths(const std::string &api_path, - const std::string &key) const - -> api_error { +auto s3_provider::create_directory_paths( + const std::string &api_path, const std::string &key) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); if (api_path == "/") { @@ -284,16 +282,12 @@ auto s3_provider::create_file_extra(const std::string &api_path, auto s3_provider::decrypt_object_name(std::string &object_name) const -> api_error { - auto parts = utils::string::split(object_name, '/', false); - for (auto &part : parts) { - if (not utils::encryption::decrypt_file_name( - get_s3_config().encryption_token, part)) { - return api_error::decryption_error; - } + if (utils::encryption::decrypt_file_path(get_s3_config().encryption_token, + object_name)) { + return api_error::success; } - object_name = utils::string::join(parts, '/'); - return api_error::success; + return api_error::decryption_error; } auto s3_provider::get_directory_item_count(const std::string &api_path) const @@ -373,26 +367,25 @@ auto s3_provider::get_directory_item_count(const std::string &api_path) const return 0U; } -auto s3_provider::get_directory_items_impl(const std::string &api_path, - directory_item_list &list) const - -> api_error { +auto s3_provider::get_directory_items_impl( + const std::string &api_path, directory_item_list &list) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); const auto &cfg{get_s3_config()}; auto is_encrypted{not cfg.encryption_token.empty()}; - const auto add_diretory_item = [this, &cfg, &is_encrypted, &list]( - const std::string &child_object_name, - bool directory, auto node) -> api_error { + const auto add_diretory_item = + [this, &is_encrypted, &list](const std::string &child_object_name, + bool directory, auto node) -> api_error { auto res{api_error::success}; directory_item dir_item{}; dir_item.api_path = child_object_name; dir_item.directory = directory; if (is_encrypted) { - if (not utils::encryption::decrypt_file_path(cfg.encryption_token, - dir_item.api_path)) { - return api_error::decryption_error; + res = decrypt_object_name(dir_item.api_path); + if (res != api_error::success) { + return res; } } dir_item.api_path = utils::path::create_api_path(dir_item.api_path); @@ -526,8 +519,8 @@ auto s3_provider::get_directory_items_impl(const std::string &api_path, return api_error::success; } -auto s3_provider::get_file(const std::string &api_path, api_file &file) const - -> api_error { +auto s3_provider::get_file(const std::string &api_path, + api_file &file) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try { @@ -566,8 +559,8 @@ auto s3_provider::get_file(const std::string &api_path, api_file &file) const return api_error::error; } -auto s3_provider::get_file_list(api_file_list &list, std::string &marker) const - -> api_error { +auto s3_provider::get_file_list(api_file_list &list, + std::string &marker) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try { @@ -653,9 +646,8 @@ auto s3_provider::get_file_list(api_file_list &list, std::string &marker) const return api_error::error; } -auto s3_provider::get_last_modified(bool directory, - const std::string &api_path) const - -> std::uint64_t { +auto s3_provider::get_last_modified( + bool directory, const std::string &api_path) const -> std::uint64_t { bool is_encrypted{}; std::string object_name; head_object_result result{}; @@ -665,10 +657,9 @@ auto s3_provider::get_last_modified(bool directory, : utils::time::get_time_now(); } -auto s3_provider::get_object_info(bool directory, const std::string &api_path, - bool &is_encrypted, std::string &object_name, - head_object_result &result) const - -> api_error { +auto s3_provider::get_object_info( + bool directory, const std::string &api_path, bool &is_encrypted, + std::string &object_name, head_object_result &result) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try { @@ -727,12 +718,10 @@ auto s3_provider::get_object_info(bool directory, const std::string &api_path, return api_error::error; } -auto s3_provider::get_object_list(std::string &response_data, - long &response_code, - std::optional delimiter, - std::optional prefix, - std::optional token) const - -> bool { +auto s3_provider::get_object_list( + std::string &response_data, long &response_code, + std::optional delimiter, std::optional prefix, + std::optional token) const -> bool { curl::requests::http_get get{}; get.allow_timeout = true; get.aws_service = "aws:amz:" + get_s3_config().region + ":s3"; @@ -760,8 +749,8 @@ auto s3_provider::get_total_drive_space() const -> std::uint64_t { return std::numeric_limits::max() / std::int64_t(2); } -auto s3_provider::is_directory(const std::string &api_path, bool &exists) const - -> api_error { +auto s3_provider::is_directory(const std::string &api_path, + bool &exists) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try { @@ -788,8 +777,8 @@ auto s3_provider::is_directory(const std::string &api_path, bool &exists) const return api_error::error; } -auto s3_provider::is_file(const std::string &api_path, bool &exists) const - -> api_error { +auto s3_provider::is_file(const std::string &api_path, + bool &exists) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try {