2.0.0-rc (#9)
Some checks failed
BlockStorage/repertory_osx/pipeline/head This commit looks good
BlockStorage/repertory_windows/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head There was a failure building this commit
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
BlockStorage/repertory_osx_builds/pipeline/head There was a failure building this commit
Some checks failed
BlockStorage/repertory_osx/pipeline/head This commit looks good
BlockStorage/repertory_windows/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head There was a failure building this commit
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
BlockStorage/repertory_osx_builds/pipeline/head There was a failure building this commit
### Issues * \#1 \[bug\] Unable to mount S3 due to 'item_not_found' exception * \#2 Require bucket name for S3 mounts * \#3 \[bug\] File size is not being updated in S3 mount * \#4 Upgrade to libfuse-3.x.x * \#5 Switch to renterd for Sia support * \#6 Switch to cpp-httplib to further reduce dependencies * \#7 Remove global_data and calculate used disk space per provider * \#8 Switch to libcurl for S3 mount support ### Changes from v1.x.x * Added read-only encrypt provider * Pass-through mount point that transparently encrypts source data using `XChaCha20-Poly1305` * Added S3 encryption support via `XChaCha20-Poly1305` * Added replay protection to remote mounts * Added support base64 writes in remote FUSE * Created static linked Linux binaries for `amd64` and `aarch64` using `musl-libc` * Removed legacy Sia renter support * Removed Skynet support * Fixed multiple remote mount WinFSP API issues on \*NIX servers * Implemented chunked read and write * Writes for non-cached files are performed in chunks of 8Mib * Removed `repertory-ui` support * Removed `FreeBSD` support * Switched to `libsodium` over `CryptoPP` * Switched to `XChaCha20-Poly1305` for remote mounts * Updated `GoogleTest` to v1.14.0 * Updated `JSON for Modern C++` to v3.11.2 * Updated `OpenSSL` to v1.1.1w * Updated `RocksDB` to v8.5.3 * Updated `WinFSP` to 2023 * Updated `boost` to v1.78.0 * Updated `cURL` to v8.3.0 * Updated `zlib` to v1.3 * Use `upload_manager` for all providers * Adds a delay to uploads to prevent excessive API calls * Supports re-upload after mount restart for incomplete uploads * NOTE: Uploads for all providers are full file (no resume support) * Multipart upload support is planned for S3 Reviewed-on: #9
This commit is contained in:
@ -1,43 +1,66 @@
|
||||
/*
|
||||
Copyright <2018-2022> <scott.e.graves@protonmail.com>
|
||||
Copyright <2018-2023> <scott.e.graves@protonmail.com>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
|
||||
associated documentation files (the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or
|
||||
substantial portions of the Software.
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
|
||||
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
*/
|
||||
#ifndef INCLUDE_RPC_SERVER_FULL_SERVER_HPP_
|
||||
#define INCLUDE_RPC_SERVER_FULL_SERVER_HPP_
|
||||
|
||||
#include "common.hpp"
|
||||
#include "rpc/server/server.hpp"
|
||||
|
||||
namespace repertory {
|
||||
class i_open_file_table;
|
||||
class i_file_manager;
|
||||
class i_provider;
|
||||
|
||||
class full_server final : public server {
|
||||
public:
|
||||
explicit full_server(app_config &config, i_provider &provider, i_open_file_table &oft);
|
||||
explicit full_server(app_config &config, i_provider &provider,
|
||||
i_file_manager &fm);
|
||||
|
||||
~full_server() override = default;
|
||||
|
||||
private:
|
||||
i_provider &provider_;
|
||||
i_open_file_table &oft_;
|
||||
i_file_manager &fm_;
|
||||
|
||||
private:
|
||||
void handle_get_directory_items(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_get_drive_information(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_get_open_files(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_get_pinned_files(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_get_pinned_status(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_pin_file(const httplib::Request &req, httplib::Response &res);
|
||||
|
||||
void handle_unpin_file(const httplib::Request &req, httplib::Response &res);
|
||||
|
||||
protected:
|
||||
bool handle_request(jsonrpcpp::request_ptr &request,
|
||||
std::unique_ptr<jsonrpcpp::Response> &response) override;
|
||||
void initialize(httplib::Server &inst) override;
|
||||
};
|
||||
} // namespace repertory
|
||||
|
||||
|
@ -1,71 +1,33 @@
|
||||
/*
|
||||
Copyright <2018-2022> <scott.e.graves@protonmail.com>
|
||||
Copyright <2018-2023> <scott.e.graves@protonmail.com>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
|
||||
associated documentation files (the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or
|
||||
substantial portions of the Software.
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
|
||||
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
*/
|
||||
#ifndef INCLUDE_RPC_SERVER_SERVER_HPP_
|
||||
#define INCLUDE_RPC_SERVER_SERVER_HPP_
|
||||
|
||||
#include "common.hpp"
|
||||
#include "types/rpc.hpp"
|
||||
|
||||
namespace repertory {
|
||||
class app_config;
|
||||
|
||||
class server {
|
||||
typedef std::map<std::string, std::string, httpserver::http::arg_comparator> query_map;
|
||||
|
||||
private:
|
||||
class json_response final : public httpserver::http_response {
|
||||
public:
|
||||
json_response() = default;
|
||||
|
||||
explicit json_response(const json &content,
|
||||
int response_code = httpserver::http::http_utils::http_ok,
|
||||
const std::string &content_type = "application/json")
|
||||
: http_response(response_code, content_type), content(content.dump(0)) {}
|
||||
|
||||
json_response(const json_response &other) = default;
|
||||
json_response(json_response &&other) noexcept = default;
|
||||
|
||||
json_response &operator=(const json_response &b) = default;
|
||||
json_response &operator=(json_response &&b) = default;
|
||||
|
||||
~json_response() override = default;
|
||||
|
||||
MHD_Response *get_raw_response() override {
|
||||
const auto size = content.length();
|
||||
return MHD_create_response_from_buffer(size, (void *)content.c_str(), MHD_RESPMEM_PERSISTENT);
|
||||
}
|
||||
|
||||
private:
|
||||
std::string content = "";
|
||||
};
|
||||
|
||||
class rpc_resource final : public httpserver::http_resource {
|
||||
public:
|
||||
explicit rpc_resource(server &owner);
|
||||
|
||||
private:
|
||||
server &owner_;
|
||||
|
||||
public:
|
||||
const std::shared_ptr<httpserver::http_response>
|
||||
render(const httpserver::http_request &request) override;
|
||||
};
|
||||
|
||||
public:
|
||||
explicit server(app_config &config);
|
||||
|
||||
@ -73,21 +35,35 @@ public:
|
||||
|
||||
private:
|
||||
app_config &config_;
|
||||
rpc_resource resource_;
|
||||
std::unique_ptr<httpserver::webserver> ws_;
|
||||
std::unique_ptr<httplib::Server> server_;
|
||||
std::unique_ptr<std::thread> server_thread_;
|
||||
std::mutex start_stop_mutex_;
|
||||
bool started_ = false;
|
||||
std::atomic<bool> started_ = false;
|
||||
|
||||
private:
|
||||
bool check_authorization(const httpserver::http_request &request);
|
||||
// [[nodiscard]] bool check_authorization(const httpserver::http_request
|
||||
// &request);
|
||||
|
||||
[[nodiscard]] auto check_authorization(const httplib::Request &req) -> bool;
|
||||
|
||||
void handle_get_config(const httplib::Request &req, httplib::Response &res);
|
||||
|
||||
void handle_get_config_value_by_name(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_set_config_value_by_name(const httplib::Request &req,
|
||||
httplib::Response &res);
|
||||
|
||||
void handle_unmount(const httplib::Request &req, httplib::Response &res);
|
||||
|
||||
protected:
|
||||
app_config &get_config() { return config_; }
|
||||
[[nodiscard]] auto get_config() -> app_config & { return config_; }
|
||||
|
||||
const app_config &get_config() const { return config_; }
|
||||
[[nodiscard]] auto get_config() const -> const app_config & {
|
||||
return config_;
|
||||
}
|
||||
|
||||
virtual bool handle_request(jsonrpcpp::request_ptr &request,
|
||||
std::unique_ptr<jsonrpcpp::Response> &response);
|
||||
virtual void initialize(httplib::Server &inst);
|
||||
|
||||
public:
|
||||
void start();
|
||||
|
Reference in New Issue
Block a user