updated build system

support/include/utils/config.hpp

@@ -468,7 +468,7 @@ struct http_range final {
   std::uint64_t end{};
 };
 
-using http_headers = std::unordered_map<std::string, std::string>;
+using http_headers = std::map<std::string, std::string>;
 using http_query_parameters = std::map<std::string, std::string>;
 using http_ranges = std::vector<http_range>;
 #endif // defined(PROJECT_ENABLE_CURL)

support/include/utils/encrypting_reader.hpp

@@ -87,16 +87,16 @@ private:
   auto reader_function(char *buffer, size_t size, size_t nitems) -> size_t;
 
 public:
-  [[nodiscard]] static auto
-  calculate_decrypted_size(std::uint64_t total_size) -> std::uint64_t;
+  [[nodiscard]] static auto calculate_decrypted_size(std::uint64_t total_size)
+      -> std::uint64_t;
 
   [[nodiscard]] static auto
   calculate_encrypted_size(std::string_view source_path) -> std::uint64_t;
 
   [[nodiscard]] auto create_iostream() const -> std::shared_ptr<iostream>;
 
-  [[nodiscard]] static constexpr auto
-  get_encrypted_chunk_size() -> std::size_t {
+  [[nodiscard]] static constexpr auto get_encrypted_chunk_size()
+      -> std::size_t {
     return encrypted_chunk_size_;
   }
 
@@ -116,9 +116,12 @@ public:
     return error_return_;
   }
 
-  [[nodiscard]] auto get_iv_list()
-      -> std::vector<std::array<unsigned char,
-                                crypto_aead_xchacha20poly1305_IETF_NPUBBYTES>> {
+  [[nodiscard]] static constexpr auto get_header_size() -> std::size_t {
+    return header_size_;
+  }
+
+  [[nodiscard]] auto get_iv_list() -> std::vector<
+      std::array<unsigned char, crypto_aead_xchacha20poly1305_IETF_NPUBBYTES>> {
     return iv_list_;
   }
 
@@ -131,8 +134,8 @@ public:
   }
 
   [[nodiscard]] static auto reader_function(char *buffer, size_t size,
-                                            size_t nitems,
-                                            void *instream) -> size_t {
+                                            size_t nitems, void *instream)
+      -> size_t {
     return reinterpret_cast<encrypting_reader *>(instream)->reader_function(
         buffer, size, nitems);
   }

support/include/utils/encryption.hpp

@@ -56,8 +56,8 @@ inline auto generate_key(
 template <typename result_t, typename arr_t, std::size_t arr_size>
 [[nodiscard]] inline auto decrypt_data(const std::array<arr_t, arr_size> &key,
                                        const unsigned char *buffer,
-                                       std::size_t buffer_size,
-                                       result_t &res) -> bool {
+                                       std::size_t buffer_size, result_t &res)
+    -> bool {
   if (buffer_size > encryption_header_size) {
     const std::uint32_t size =
         boost::endian::native_to_big(static_cast<std::uint32_t>(buffer_size));
@@ -76,8 +76,8 @@ template <typename result_t, typename arr_t, std::size_t arr_size>
 template <typename buffer_t, typename result_t, typename arr_t,
           std::size_t arr_size>
 [[nodiscard]] inline auto decrypt_data(const std::array<arr_t, arr_size> &key,
-                                       const buffer_t &buf,
-                                       result_t &res) -> bool {
+                                       const buffer_t &buf, result_t &res)
+    -> bool {
   return decrypt_data<result_t>(
       key, reinterpret_cast<const unsigned char *>(buf.data()), buf.size(),
       res);
@@ -195,6 +195,11 @@ read_encrypted_range(const http_range &range,
                      const utils::encryption::hash_256_t &key,
                      reader_func_t reader_func, std::uint64_t total_size,
                      data_buffer &data) -> bool;
+
+[[nodiscard]] auto read_encrypted_range(
+    const http_range &range, const utils::encryption::hash_256_t &key,
+    reader_func_t reader_func, std::uint64_t total_size, unsigned char *data,
+    std::size_t size, std::size_t &bytes_read) -> bool;
 #endif // defined(PROJECT_ENABLE_CURL)
 #endif // defined(PROJECT_ENABLE_BOOST)
 

support/include/utils/file_enc_file.hpp

@@ -45,12 +45,13 @@ public:
 
 private:
   fs_file_t file_;
+  std::string encryption_token_;
 
 public:
   void close() override;
 
-  [[nodiscard]] auto copy_to(std::string_view new_path,
-                             bool overwrite) const -> bool override;
+  [[nodiscard]] auto copy_to(std::string_view new_path, bool overwrite) const
+      -> bool override;
 
   [[nodiscard]] auto exists() const -> bool override { return file_->exists(); }
 
@@ -68,8 +69,8 @@ public:
     return file_->get_read_buffer_size();
   }
 
-  [[nodiscard]] auto
-  get_time(time_type type) const -> std::optional<std::uint64_t> override {
+  [[nodiscard]] auto get_time(time_type type) const
+      -> std::optional<std::uint64_t> override {
     return file_->get_time(type);
   }
 
@@ -97,9 +98,10 @@ public:
 
   [[nodiscard]] auto truncate(std::size_t size) -> bool override;
 
-  [[nodiscard]] auto
-  write(const unsigned char *data, std::size_t to_write, std::size_t offset,
-        std::size_t *total_written = nullptr) -> bool override;
+  [[nodiscard]] auto write(const unsigned char *data, std::size_t to_write,
+                           std::size_t offset,
+                           std::size_t *total_written = nullptr)
+      -> bool override;
 
 public:
   [[nodiscard]] operator bool() const override {

support/include/utils/file_thread_file.hpp

@@ -23,7 +23,6 @@
 #define REPERTORY_INCLUDE_UTILS_FILE_THREAD_FILE_HPP_
 
 #include "utils/file.hpp"
-#include <memory>
 
 namespace repertory::utils::file {
 class thread_file final : public i_file {