32 Commits

Author SHA1 Message Date
dfa170022a refactor
Some checks reported errors
BlockStorage/repertory/pipeline/head Something is wrong with the build of this commit
2025-04-04 10:05:17 -05:00
52c2780283 [bug] Windows-to-Linux remote mount ignores CREATE_NEW #44 2025-04-04 10:02:37 -05:00
c2dbfc970a refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 21:18:37 -05:00
6f9b1f8f08 fix marker 2025-04-03 21:17:44 -05:00
078d603be9 refactor 2025-04-03 21:15:08 -05:00
983e47103b refactor
Some checks are pending
BlockStorage/repertory/pipeline/head Build queued...
2025-04-03 21:02:49 -05:00
8d2024d34b refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 19:34:42 -05:00
4f2ee2ad99 [bug] Directories are not importing properly for Sia #43 2025-04-03 19:27:46 -05:00
533938bcef [bug] Directories are not importing properly for Sia #43 2025-04-03 19:26:42 -05:00
98edf33be4 updated CHANGELOG.md
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 17:23:11 -05:00
a080c9ff86 refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 17:20:03 -05:00
e6cdcd74a1 [bug] Directories are not importing properly for Sia #43
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 14:26:22 -05:00
573ae549be updated CHANGELOG.md
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 13:01:48 -05:00
fca149f998 removed debugging 2025-04-03 12:57:40 -05:00
76e375c488 debugging
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 11:59:28 -05:00
3f9322f659 debugging
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 11:48:22 -05:00
c286d496c3 fix
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-03 11:16:03 -05:00
56ba0fcb83 debugging
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
2025-04-03 11:08:48 -05:00
dcafb104ea [Unit Test] Complete WinFSP unit tests #21
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
initial support for winfsp to linux remote testing
initial support for linx to winfsp remote testing
2025-04-02 14:18:35 -05:00
ab757dfd36 [Unit Test] Complete WinFSP unit tests #21
initial support for winfsp to linux remote testing
2025-04-02 14:11:37 -05:00
eec2d2e9a9 fix and refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-02 14:05:10 -05:00
8c1c91e02b fix
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
2025-04-02 13:58:29 -05:00
bb85015733 [bug] Remote mount directory listing on Windows connected to Linux is failing #42
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
2025-04-02 13:40:15 -05:00
883de836c6 fix missing function name
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-02 11:09:05 -05:00
bf2bdd1b5d [bug] Remote mount directory listing on Windows connected to Linux is failing #42
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-02 10:41:05 -05:00
f1e82d8f9f [bug] Remote mount directory listing on Windows connected to Linux is failing #42
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-04-02 10:21:29 -05:00
f5c4aebdac fix json names 2025-04-02 10:17:23 -05:00
f2f9e8fd15 updated CHANGELOG.md
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-03-27 10:01:18 -05:00
2a673915af updated CHANGELOG.md 2025-03-27 10:00:06 -05:00
df3db38ae7 letters should be lowercase 2025-03-27 09:58:11 -05:00
b0b69c6dd4 refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-03-26 14:33:34 -05:00
11b118a30f updated version 2025-03-26 07:11:35 -05:00
17 changed files with 560 additions and 405 deletions

View File

@ -1,7 +1,24 @@
# Changelog
## v2.0.6-release
### Issues
* ~~\#12 [Unit Test] Complete all providers unit tests~~
* ~~\#21 [Unit Test] Complete WinFSP unit tests~~
* ~~\#22 [Unit Test] Complete FUSE unit tests~~
* ~~\#33 Complete initial v2.0 documentation~~
* \#42 [bug] Remote mount directory listing on Windows connected to Linux is failing
* \#43 [bug] Directories are not importing properly for Sia
* \#44 [bug] Windows-to-Linux remote mount ignores `CREATE_NEW`
### Changes from v2.0.5-rc
* Drive letters in UI should always be lowercase
## v2.0.5-rc
<!-- markdownlint-disable-next-line -->
### Issues
* \#39 Create management portal in Flutter

View File

@ -10,7 +10,7 @@ PROJECT_DESC="Mount utility for Sia and S3"
PROJECT_MAJOR_VERSION=2
PROJECT_MINOR_VERSION=0
PROJECT_REVISION_VERSION=5
PROJECT_REVISION_VERSION=6
PROJECT_RELEASE_NUM=0
PROJECT_RELEASE_ITER=rc

View File

@ -225,8 +225,7 @@ public:
}
if (curl_code != CURLE_OK) {
event_system::instance().raise<curl_error>(curl_code, function_name,
url);
event_system::instance().raise<curl_error>(curl_code, function_name, url);
return false;
}

View File

@ -54,12 +54,13 @@ REPERTORY_IGNORE_WARNINGS_DISABLE()
using namespace std::chrono_literals;
using json = nlohmann::json;
inline constexpr const std::string_view REPERTORY = "repertory";
inline constexpr const std::wstring_view REPERTORY_W = L"repertory";
inline constexpr const std::string_view REPERTORY{"repertory"};
inline constexpr const std::string_view REPERTORY_DATA_NAME{"repertory2"};
inline constexpr const std::wstring_view REPERTORY_W{L"repertory"};
inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION = 2ULL;
inline constexpr const std::string_view REPERTORY_DATA_NAME = "repertory2";
inline constexpr const std::string_view REPERTORY_MIN_REMOTE_VERSION = "2.0.0";
inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION{2ULL};
inline constexpr const std::string_view REPERTORY_MIN_REMOTE_VERSION{"2.0.0"};
inline constexpr const std::string_view RENTERD_MIN_VERSION{"2.0.0"};
#define REPERTORY_INVALID_HANDLE INVALID_HANDLE_VALUE
@ -221,7 +222,6 @@ using WCHAR = wchar_t;
#define MAX_PATH 260
#define STATUS_SUCCESS std::uint32_t{0U}
#define STATUS_ACCESS_DENIED std::uint32_t{0xC0000022L}
#define STATUS_DEVICE_BUSY std::uint32_t{0x80000011L}
#define STATUS_DEVICE_INSUFFICIENT_RESOURCES std::uint32_t{0xC0000468L}
@ -234,11 +234,13 @@ using WCHAR = wchar_t;
#define STATUS_INVALID_HANDLE std::uint32_t{0xC0000006L}
#define STATUS_INVALID_IMAGE_FORMAT std::uint32_t{0xC000007BL}
#define STATUS_INVALID_PARAMETER std::uint32_t{0xC000000DL}
#define STATUS_NO_MEMORY std::uint32_t{0xC0000017L}
#define STATUS_NOT_IMPLEMENTED std::uint32_t{0xC0000002L}
#define STATUS_NO_MEMORY std::uint32_t{0xC0000017L}
#define STATUS_OBJECT_NAME_COLLISION std::uint32_t{0xC0000035L}
#define STATUS_OBJECT_NAME_EXISTS std::uint32_t{0x40000000L}
#define STATUS_OBJECT_NAME_NOT_FOUND std::uint32_t{0xC0000034L}
#define STATUS_OBJECT_PATH_INVALID std::uint32_t{0xC0000039L}
#define STATUS_SUCCESS std::uint32_t{0U}
#define STATUS_UNEXPECTED_IO_ERROR std::uint32_t{0xC00000E9L}
#define CONVERT_STATUS_NOT_IMPLEMENTED(e) \

View File

@ -59,7 +59,8 @@ private:
static void populate_stat(const struct stat64 &unix_st, remote::stat &r_stat);
[[nodiscard]] auto update_to_windows_format(json &item) -> json &;
[[nodiscard]] auto update_to_windows_format(const std::string &root_api_path,
json &item) -> json &;
public:
// FUSE Layer

View File

@ -49,16 +49,28 @@ private:
sia_config sia_config_;
private:
[[nodiscard]] auto create_directory_key(const std::string &api_path) const
-> repertory::api_error;
[[nodiscard]] auto ensure_directory_exists(const std::string &api_path) const
-> api_error;
[[nodiscard]] auto get_object_info(const std::string &api_path,
json &object_info) const -> api_error;
[[nodiscard]] auto get_object_list(const std::string &api_path,
nlohmann::json &object_list) const -> bool;
[[nodiscard]] auto
get_object_list(const std::string &api_path, nlohmann::json &object_list,
std::optional<std::string> marker = std::nullopt) const
-> bool;
[[nodiscard]] auto get_sia_config() const -> const auto & {
return sia_config_;
}
void iterate_objects(
const std::string &api_path, const json &object_list,
std::function<void(const std::string &, bool, json)> handle_entry) const;
protected:
[[nodiscard]] auto create_directory_impl(const std::string &api_path,
api_meta_map &meta)

View File

@ -374,13 +374,13 @@ auto fuse_base::init_impl(struct fuse_conn_info *conn) -> void * {
if (not utils::file::change_to_process_directory()) {
utils::error::raise_error(function_name,
"failed to change to process directory");
event_system::instance().raise<unmount_requested>();
event_system::instance().raise<unmount_requested>(function_name);
return this;
}
if (not console_enabled_ && not repertory::project_initialize()) {
utils::error::raise_error(function_name, "failed to initialize repertory");
event_system::instance().raise<unmount_requested>();
event_system::instance().raise<unmount_requested>(function_name);
}
return this;

View File

@ -259,7 +259,7 @@ auto remote_fuse_drive::init_impl(struct fuse_conn_info *conn) -> void * {
if (remote_instance_->fuse_init() != 0) {
utils::error::raise_error(function_name,
"failed to connect to remote server");
event_system::instance().raise<unmount_requested>();
event_system::instance().raise<unmount_requested>(function_name);
} else {
server_ = std::make_shared<server>(config_);
server_->start();

View File

@ -1120,49 +1120,56 @@ auto remote_server::winfsp_create(PWSTR file_name, UINT32 create_options,
-> packet::error_type {
REPERTORY_USES_FUNCTION_NAME();
const auto relative_path = utils::string::to_utf8(file_name);
const auto file_path = construct_path(relative_path);
exists = utils::file::file(file_path).exists();
auto relative_path = utils::string::to_utf8(file_name);
auto file_path = construct_path(relative_path);
exists = utils::file::file{file_path}.exists() ||
utils::file::directory{file_path}.exists();
if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
attributes |= FILE_ATTRIBUTE_DIRECTORY;
auto ret{static_cast<packet::error_type>(STATUS_SUCCESS)};
if (exists) {
ret = static_cast<packet::error_type>(STATUS_OBJECT_NAME_COLLISION);
} else {
attributes &= static_cast<UINT32>(~FILE_ATTRIBUTE_DIRECTORY);
attributes |= FILE_ATTRIBUTE_ARCHIVE;
}
remote::file_mode mode{0U};
std::uint32_t flags{0U};
utils::windows_create_to_unix(create_options, granted_access, flags, mode);
int res = 0;
if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
res = mkdir(file_path.c_str(), mode);
if (res >= 0) {
res = open(file_path.c_str(), static_cast<int>(flags));
if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
attributes |= FILE_ATTRIBUTE_DIRECTORY;
} else {
attributes &= static_cast<UINT32>(~FILE_ATTRIBUTE_DIRECTORY);
attributes |= FILE_ATTRIBUTE_ARCHIVE;
}
} else {
res = open(file_path.c_str(), static_cast<int>(flags), mode);
remote::file_mode mode{0U};
std::uint32_t flags{0U};
utils::windows_create_to_unix(create_options, granted_access, flags, mode);
auto res{0};
if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
res = mkdir(file_path.c_str(), mode);
if (res >= 0) {
res = open(file_path.c_str(), static_cast<int>(flags));
}
} else {
res = open(file_path.c_str(), static_cast<int>(flags), mode);
}
if (res >= 0) {
*file_desc = reinterpret_cast<PVOID>(res);
drive_.set_item_meta(construct_api_path(file_path), META_ATTRIBUTES,
std::to_string(attributes));
set_open_info(res, open_info{
"",
nullptr,
{},
file_path,
});
const auto api_path = utils::path::create_api_path(relative_path);
normalized_name = utils::string::replace_copy(api_path, '/', '\\');
populate_file_info(api_path, 0, attributes, *file_info);
}
ret = static_cast<packet::error_type>(
utils::unix_error_to_windows((res < 0) ? errno : 0));
}
if (res >= 0) {
*file_desc = reinterpret_cast<PVOID>(res);
drive_.set_item_meta(construct_api_path(file_path), META_ATTRIBUTES,
std::to_string(attributes));
set_open_info(res, open_info{
"",
nullptr,
{},
file_path,
});
const auto api_path = utils::path::create_api_path(relative_path);
normalized_name = utils::string::replace_copy(api_path, '/', '\\');
populate_file_info(api_path, 0, attributes, *file_info);
}
auto ret = static_cast<packet::error_type>(
utils::unix_error_to_windows((res < 0) ? errno : 0));
RAISE_REMOTE_FUSE_SERVER_EVENT(function_name, file_path, ret);
return ret;
}
@ -1390,11 +1397,11 @@ auto remote_server::winfsp_read_directory(PVOID file_desc, PWSTR /*pattern*/,
item_list.clear();
const auto handle = reinterpret_cast<remote::file_handle>(file_desc);
auto handle = reinterpret_cast<remote::file_handle>(file_desc);
auto ret = static_cast<packet::error_type>(
has_open_info(static_cast<native_handle>(handle), STATUS_INVALID_HANDLE));
if (ret == STATUS_SUCCESS) {
const auto api_path = construct_api_path(
auto api_path = construct_api_path(
get_open_file_path(static_cast<native_handle>(handle)));
directory_iterator iterator(drive_.get_directory_items(api_path));
auto offset = marker == nullptr
@ -1405,7 +1412,7 @@ auto remote_server::winfsp_read_directory(PVOID file_desc, PWSTR /*pattern*/,
json item;
while (iterator.get_json(offset++, item) == 0) {
try {
item_list.emplace_back(update_to_windows_format(item));
item_list.emplace_back(update_to_windows_format(api_path, item));
} catch (const std::exception &e) {
utils::error::raise_error(function_name, e, "exception occurred");
}
@ -1679,30 +1686,53 @@ auto remote_server::json_release_directory_snapshot(
return 0;
}
auto remote_server::update_to_windows_format(json &item) -> json & {
const auto api_path = item["path"].get<std::string>();
item["meta"][META_ACCESSED] = std::to_string(
utils::string::to_uint64(empty_as_zero(item["meta"][META_ACCESSED])));
item["meta"][META_CREATION] = std::to_string(
utils::string::to_uint64(empty_as_zero(item["meta"][META_CREATION])));
item["meta"][META_MODIFIED] = std::to_string(
utils::string::to_uint64(empty_as_zero(item["meta"][META_MODIFIED])));
auto remote_server::update_to_windows_format(const std::string &root_api_path,
json &item) -> json & {
REPERTORY_USES_FUNCTION_NAME();
if (item["meta"][META_WRITTEN].empty() ||
(item["meta"][META_WRITTEN].get<std::string>() == "0") ||
(item["meta"][META_WRITTEN].get<std::string>() ==
std::to_string(utils::time::WIN32_TIME_CONVERSION))) {
drive_.set_item_meta(api_path, META_WRITTEN,
item["meta"][META_MODIFIED].get<std::string>());
item["meta"][META_WRITTEN] = item["meta"][META_MODIFIED];
auto api_path = item[JSON_API_PATH].get<std::string>();
if (api_path == "." || api_path == "..") {
auto orig_api_path{api_path};
api_path = api_path == "."
? root_api_path
: utils::path::get_parent_api_path(root_api_path);
api_meta_map meta;
auto res = drive_.get_item_meta(api_path, meta);
if (res != api_error::success) {
utils::error::raise_api_path_error(
function_name, api_path, res,
fmt::format("failed to get '{}' meta", orig_api_path));
return item;
}
item[JSON_META] = meta;
}
if (item["meta"][META_ATTRIBUTES].empty()) {
item["meta"][META_ATTRIBUTES] =
item["directory"].get<bool>() ? std::to_string(FILE_ATTRIBUTE_DIRECTORY)
: std::to_string(FILE_ATTRIBUTE_ARCHIVE);
item[JSON_META][META_ACCESSED] = std::to_string(
utils::string::to_uint64(empty_as_zero(item[JSON_META][META_ACCESSED])));
item[JSON_META][META_CREATION] = std::to_string(
utils::string::to_uint64(empty_as_zero(item[JSON_META][META_CREATION])));
item[JSON_META][META_MODIFIED] = std::to_string(
utils::string::to_uint64(empty_as_zero(item[JSON_META][META_MODIFIED])));
if (item[JSON_META][META_WRITTEN].empty() ||
(item[JSON_META][META_WRITTEN].get<std::string>() == "0") ||
(item[JSON_META][META_WRITTEN].get<std::string>() ==
std::to_string(utils::time::WIN32_TIME_CONVERSION))) {
drive_.set_item_meta(api_path, META_WRITTEN,
item[JSON_META][META_MODIFIED].get<std::string>());
item[JSON_META][META_WRITTEN] = item[JSON_META][META_MODIFIED];
}
if (item[JSON_META][META_ATTRIBUTES].empty()) {
item[JSON_META][META_ATTRIBUTES] =
item[JSON_DIRECTORY].get<bool>()
? std::to_string(FILE_ATTRIBUTE_DIRECTORY)
: std::to_string(FILE_ATTRIBUTE_ARCHIVE);
drive_.set_item_meta(api_path, META_ATTRIBUTES,
item["meta"][META_ATTRIBUTES].get<std::string>());
item[JSON_META][META_ATTRIBUTES].get<std::string>());
}
return item;

View File

@ -188,23 +188,21 @@ auto remote_client::winfsp_create(PWSTR file_name, UINT32 create_options,
DECODE_OR_IGNORE(&response, normalized_name);
DECODE_OR_IGNORE(&response, exists);
if (ret == STATUS_SUCCESS) {
*file_desc = reinterpret_cast<PVOID>(handle);
set_open_info(to_handle(*file_desc),
open_info{
"",
nullptr,
{},
utils::string::to_utf8(file_name),
});
#if defined(_WIN32)
if (exists) {
::SetLastError(ERROR_ALREADY_EXISTS);
}
#endif
}
*file_desc = reinterpret_cast<PVOID>(handle);
set_open_info(to_handle(*file_desc), open_info{
"",
nullptr,
{},
utils::string::to_utf8(file_name),
});
}
#if defined(_WIN32)
if (ret == STATUS_OBJECT_NAME_COLLISION && exists != 0U) {
::SetLastError(ERROR_ALREADY_EXISTS);
}
#endif // defined(_WIN32)
return ret;
}

View File

@ -361,11 +361,10 @@ auto remote_winfsp_drive::ReadDirectory(PVOID /*file_node*/, PVOID file_desc,
&ret)) {
auto item_found = false;
for (const auto &item : item_list) {
auto item_path = item["path"].get<std::string>();
auto item_path = item[JSON_API_PATH].get<std::string>();
auto display_name = utils::string::from_utf8(
utils::path::strip_to_file_name(item_path));
if (not marker || (marker && item_found)) {
// if (not utils::path::is_ads_file_path(item_path)) {
union {
UINT8 B[FIELD_OFFSET(FSP_FSCTL_DIR_INFO, FileNameBuf) +
((repertory::max_path_length + 1U) * sizeof(WCHAR))];
@ -380,10 +379,8 @@ auto remote_winfsp_drive::ReadDirectory(PVOID /*file_node*/, PVOID file_desc,
display_name.size()) *
sizeof(WCHAR)));
if (not item["meta"].empty() ||
((item_path != ".") && (item_path != ".."))) {
populate_file_info(item, directory_info->FileInfo);
}
populate_file_info(item, directory_info->FileInfo);
if (ret == STATUS_SUCCESS) {
::wcscpy_s(&directory_info->FileNameBuf[0],
repertory::max_path_length, &display_name[0]);
@ -394,7 +391,6 @@ auto remote_winfsp_drive::ReadDirectory(PVOID /*file_node*/, PVOID file_desc,
break;
}
}
// }
} else {
item_found = display_name == std::wstring(marker);
}

View File

@ -67,7 +67,7 @@ auto sia_provider::check_version(std::string &required_version,
std::string &returned_version) const -> bool {
REPERTORY_USES_FUNCTION_NAME();
required_version = "2.0.0";
required_version = RENTERD_MIN_VERSION;
try {
curl::requests::http_get get{};
@ -149,12 +149,58 @@ auto sia_provider::create_directory_impl(const std::string &api_path,
return api_error::success;
}
auto sia_provider::create_directory_key(const std::string &api_path) const
-> api_error {
auto parent_api_path = utils::path::get_parent_api_path(api_path);
json object_list;
if (not get_object_list(parent_api_path, object_list)) {
return api_error::comm_error;
}
if (not object_list.contains("objects")) {
return api_error::directory_not_found;
}
const auto &list = object_list.at("objects");
if (std::ranges::find_if(list, [&api_path](auto &&entry) -> bool {
return entry.at("key").template get<std::string>() == api_path + '/';
}) == list.end()) {
return api_error::directory_not_found;
}
api_meta_map meta;
return const_cast<sia_provider *>(this)->create_directory_impl(api_path,
meta);
}
auto sia_provider::ensure_directory_exists(const std::string &api_path) const
-> api_error {
REPERTORY_USES_FUNCTION_NAME();
bool exists{};
auto res{is_directory(api_path, exists)};
if (res != api_error::success) {
utils::error::raise_api_path_error(function_name, api_path, res,
"failed detect existing directory");
return res;
}
if (not exists) {
utils::error::raise_api_path_error(function_name, api_path, res,
"directory not found");
return api_error::directory_not_found;
}
return api_error::success;
}
auto sia_provider::get_directory_item_count(const std::string &api_path) const
-> std::uint64_t {
REPERTORY_USES_FUNCTION_NAME();
try {
json object_list{};
json object_list;
if (not get_object_list(api_path, object_list)) {
return 0U;
}
@ -192,41 +238,25 @@ auto sia_provider::get_directory_items_impl(const std::string &api_path,
-> api_error {
REPERTORY_USES_FUNCTION_NAME();
json object_list{};
json object_list;
if (not get_object_list(api_path, object_list)) {
return api_error::comm_error;
}
if (object_list.contains("objects")) {
for (const auto &entry : object_list.at("objects")) {
try {
auto name{entry.at("key").get<std::string>()};
auto entry_api_path{utils::path::create_api_path(name)};
auto directory{utils::string::ends_with(name, "/")};
if (directory && (entry_api_path == api_path)) {
continue;
iterate_objects(
api_path, object_list,
[&](auto &&entry_api_path, auto &&directory, auto &&entry) {
api_meta_map meta;
auto res{get_item_meta(entry_api_path, meta)};
if (res != api_error::success) {
utils::error::raise_api_path_error(function_name, entry_api_path, res,
"failed to get item meta");
return;
}
api_file file{};
api_meta_map meta{};
if (get_item_meta(entry_api_path, meta) == api_error::item_not_found) {
file = create_api_file(entry_api_path, "",
directory ? 0U
: entry["size"].get<std::uint64_t>(),
get_last_modified(entry));
get_api_item_added()(directory, file);
auto res{get_item_meta(entry_api_path, meta)};
if (res != api_error::success) {
utils::error::raise_api_path_error(function_name, entry_api_path,
res, "failed to get item meta");
continue;
}
} else {
file = create_api_file(
entry_api_path,
directory ? 0U : entry["size"].get<std::uint64_t>(), meta);
}
auto file = create_api_file(
entry_api_path,
directory ? 0U : entry["size"].template get<std::uint64_t>(), meta);
directory_item dir_item{};
dir_item.api_parent = file.api_parent;
@ -235,13 +265,7 @@ auto sia_provider::get_directory_items_impl(const std::string &api_path,
dir_item.meta = meta;
dir_item.size = file.file_size;
list.emplace_back(std::move(dir_item));
} catch (const std::exception &e) {
utils::error::raise_api_path_error(function_name, api_path, e,
"failed to process entry|" +
entry.dump());
}
}
}
});
return api_error::success;
}
@ -290,73 +314,45 @@ auto sia_provider::get_file(const std::string &api_path, api_file &file) const
return api_error::error;
}
auto sia_provider::get_file_list(api_file_list &list,
std::string & /* marker */) const
auto sia_provider::get_file_list(api_file_list &list, std::string &marker) const
-> api_error {
REPERTORY_USES_FUNCTION_NAME();
using dir_func = std::function<api_error(std::string api_path)>;
const dir_func get_files_in_dir = [&](std::string api_path) -> api_error {
try {
nlohmann::json object_list{};
if (not get_object_list(api_path, object_list)) {
return api_error::comm_error;
}
if (object_list.contains("objects")) {
for (const auto &entry : object_list.at("objects")) {
auto name{entry.at("key").get<std::string>()};
auto entry_api_path{utils::path::create_api_path(name)};
if (utils::string::ends_with(name, "/")) {
if (entry_api_path == utils::path::create_api_path(api_path)) {
continue;
}
api_meta_map meta{};
if (get_item_meta(entry_api_path, meta) ==
api_error::item_not_found) {
auto dir{
create_api_file(entry_api_path, "", 0U,
get_last_modified(entry)),
};
get_api_item_added()(true, dir);
}
auto res{get_files_in_dir(entry_api_path)};
if (res != api_error::success) {
return res;
}
continue;
}
api_file file{};
api_meta_map meta{};
if (get_item_meta(entry_api_path, meta) ==
api_error::item_not_found) {
file = create_api_file(entry_api_path, "",
entry["size"].get<std::uint64_t>(),
get_last_modified(entry));
get_api_item_added()(false, file);
} else {
file = create_api_file(entry_api_path,
entry["size"].get<std::uint64_t>(), meta);
}
list.emplace_back(std::move(file));
}
}
return api_error::success;
} catch (const std::exception &e) {
utils::error::raise_api_path_error(function_name, api_path, e,
"failed to process directory");
try {
json object_list;
if (not get_object_list("", object_list, marker)) {
return api_error::comm_error;
}
return api_error::error;
};
iterate_objects("/", object_list,
[&](auto &&entry_api_path, auto &&directory, auto &&entry) {
if (directory) {
return;
}
return get_files_in_dir("");
api_meta_map meta;
auto res{get_item_meta(entry_api_path, meta)};
if (res != api_error::success) {
utils::error::raise_api_path_error(
function_name, entry_api_path, res,
"failed to get item meta");
return;
}
list.emplace_back(create_api_file(
entry_api_path,
entry["size"].template get<std::uint64_t>(), meta));
});
marker = object_list.at("nextMarker").get<std::string>();
return object_list.at("hasMore").get<bool>() ? api_error::more_data
: api_error::success;
} catch (const std::exception &e) {
utils::error::raise_api_path_error(function_name, "/", e,
"failed to process directory");
}
return api_error::error;
}
auto sia_provider::get_object_info(const std::string &api_path,
@ -408,7 +404,9 @@ auto sia_provider::get_object_info(const std::string &api_path,
}
auto sia_provider::get_object_list(const std::string &api_path,
nlohmann::json &object_list) const -> bool {
nlohmann::json &object_list,
std::optional<std::string> marker) const
-> bool {
REPERTORY_USES_FUNCTION_NAME();
try {
@ -416,7 +414,12 @@ auto sia_provider::get_object_list(const std::string &api_path,
get.allow_timeout = true;
get.path = "/api/bus/objects" + api_path + "/";
get.query["bucket"] = get_bucket(get_sia_config());
get.query["delimiter"] = "/";
if (marker.has_value()) {
get.query["limit"] = "1000";
get.query["marker"] = marker.value();
} else {
get.query["delimiter"] = "/";
}
std::string error_data;
get.response_handler = [&error_data, &object_list](auto &&data,
@ -513,6 +516,14 @@ auto sia_provider::is_directory(const std::string &api_path, bool &exists) const
json file_data{};
auto res{get_object_info(api_path + '/', file_data)};
if (res == api_error::item_not_found) {
if (create_directory_key(api_path) == api_error::success) {
exists = true;
return api_error::success;
}
}
if (res == api_error::directory_not_found ||
res == api_error::item_not_found) {
return api_error::success;
}
@ -609,6 +620,52 @@ auto sia_provider::is_online() const -> bool {
return false;
}
void sia_provider::iterate_objects(
const std::string &api_path, const json &object_list,
std::function<void(const std::string &, bool, json)> handle_entry) const {
REPERTORY_USES_FUNCTION_NAME();
if (not object_list.contains("objects")) {
return;
}
for (const auto &entry : object_list.at("objects")) {
try {
auto name{entry.at("key").get<std::string>()};
auto directory{utils::string::ends_with(name, "/")};
auto entry_api_path{utils::path::create_api_path(name)};
{
api_meta_map meta{};
if (get_item_meta(entry_api_path, meta) == api_error::item_not_found) {
auto file = create_api_file(
entry_api_path, "",
directory ? 0U : entry["size"].get<std::uint64_t>(),
get_last_modified(entry));
if (directory) {
auto res{ensure_directory_exists(entry_api_path)};
if (res != api_error::success) {
utils::error::raise_api_path_error(
function_name, entry_api_path, res,
"failed detect existing directory");
continue;
}
}
get_api_item_added()(directory, file);
}
}
handle_entry(entry_api_path, directory, entry);
} catch (const std::exception &e) {
utils::error::raise_api_path_error(
function_name, api_path, e,
fmt::format("failed to process entry|{}", entry.dump()));
}
}
}
auto sia_provider::read_file_bytes(const std::string &api_path,
std::size_t size, std::uint64_t offset,
data_buffer &buffer,
@ -636,7 +693,6 @@ auto sia_provider::read_file_bytes(const std::string &api_path,
++idx) {
long response_code{};
const auto notify_retry = [&]() {
fmt::println("{}", std::string(buffer.begin(), buffer.end()));
if (response_code == 0) {
utils::error::raise_api_path_error(
function_name, api_path, api_error::comm_error,

View File

@ -1,187 +1,189 @@
/*
Copyright <2018-2025> <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
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 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.
*/
#include "rpc/server/server.hpp"
#include "app_config.hpp"
#include "events/event_system.hpp"
#include "events/types/service_start_begin.hpp"
#include "events/types/service_start_end.hpp"
#include "events/types/service_stop_begin.hpp"
#include "events/types/service_stop_end.hpp"
#include "events/types/unmount_requested.hpp"
#include "rpc/common.hpp"
#include "utils/error_utils.hpp"
namespace repertory {
server::server(app_config &config) : config_(config) {}
void server::handle_get_config(const httplib::Request & /*req*/,
httplib::Response &res) {
auto data = config_.get_json();
clean_json_config(config_.get_provider_type(), data);
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::ok;
}
void server::handle_get_config_value_by_name(const httplib::Request &req,
httplib::Response &res) {
auto name = req.get_param_value("name");
auto data = json({{
"value",
clean_json_value(name, config_.get_value_by_name(name)),
}});
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::ok;
}
void server::handle_set_config_value_by_name(const httplib::Request &req,
httplib::Response &res) {
auto name = req.get_param_value("name");
auto value = req.get_param_value("value");
json data = {{
"value",
clean_json_value(name, config_.set_value_by_name(name, value)),
}};
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::ok;
}
void server::handle_unmount(const httplib::Request & /*req*/,
httplib::Response &res) {
event_system::instance().raise<unmount_requested>();
res.status = http_error_codes::ok;
}
void server::initialize(httplib::Server &inst) {
inst.Get("/api/v1/" + rpc_method::get_config, [this](auto &&req, auto &&res) {
handle_get_config(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
inst.Get("/api/v1/" + rpc_method::get_config_value_by_name,
[this](auto &&req, auto &&res) {
handle_get_config_value_by_name(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
inst.Post("/api/v1/" + rpc_method::set_config_value_by_name,
[this](auto &&req, auto &&res) {
handle_set_config_value_by_name(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
inst.Post("/api/v1/" + rpc_method::unmount, [this](auto &&req, auto &&res) {
handle_unmount(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
}
void server::start() {
REPERTORY_USES_FUNCTION_NAME();
mutex_lock lock(start_stop_mutex_);
if (server_thread_) {
return;
}
event_system::instance().raise<service_start_begin>(function_name, "server");
server_ = std::make_unique<httplib::Server>();
server_->set_exception_handler([](const httplib::Request &req,
httplib::Response &res,
std::exception_ptr ptr) {
json data = {{"path", req.path}};
try {
std::rethrow_exception(ptr);
} catch (std::exception &e) {
data["error"] = (e.what() == nullptr) ? "unknown error" : e.what();
utils::error::raise_error(function_name, e,
"failed request: " + req.path);
} catch (...) {
data["error"] = "unknown error";
utils::error::raise_error(function_name, "unknown error",
"failed request: " + req.path);
}
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::internal_error;
});
server_->set_pre_routing_handler(
[this](auto &&req, auto &&res) -> httplib::Server::HandlerResponse {
if (rpc::check_authorization(config_, req)) {
return httplib::Server::HandlerResponse::Unhandled;
}
res.status = http_error_codes::unauthorized;
return httplib::Server::HandlerResponse::Handled;
});
initialize(*server_);
server_thread_ = std::make_unique<std::thread>([this]() {
server_->set_socket_options([](auto &&sock) {
#if defined(_WIN32)
int enable{1};
setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
reinterpret_cast<const char *>(&enable), sizeof(enable));
#else // !defined(_WIN32)
linger opt{1, 0};
setsockopt(sock, SOL_SOCKET, SO_LINGER,
reinterpret_cast<const char *>(&opt), sizeof(opt));
#endif // defined(_WIN32)
});
server_->listen("127.0.0.1", config_.get_api_port());
});
event_system::instance().raise<service_start_end>(function_name, "server");
}
void server::stop() {
REPERTORY_USES_FUNCTION_NAME();
unique_mutex_lock lock(start_stop_mutex_);
if (not server_thread_) {
return;
}
event_system::instance().raise<service_stop_begin>(function_name, "server");
server_->stop();
std::unique_ptr<std::thread> thread{nullptr};
std::swap(thread, server_thread_);
lock.unlock();
thread->join();
thread.reset();
lock.lock();
server_.reset();
lock.unlock();
event_system::instance().raise<service_stop_end>(function_name, "server");
}
} // namespace repertory
/*
Copyright <2018-2025> <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
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 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.
*/
#include "rpc/server/server.hpp"
#include "app_config.hpp"
#include "events/event_system.hpp"
#include "events/types/service_start_begin.hpp"
#include "events/types/service_start_end.hpp"
#include "events/types/service_stop_begin.hpp"
#include "events/types/service_stop_end.hpp"
#include "events/types/unmount_requested.hpp"
#include "rpc/common.hpp"
#include "utils/error_utils.hpp"
namespace repertory {
server::server(app_config &config) : config_(config) {}
void server::handle_get_config(const httplib::Request & /*req*/,
httplib::Response &res) {
auto data = config_.get_json();
clean_json_config(config_.get_provider_type(), data);
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::ok;
}
void server::handle_get_config_value_by_name(const httplib::Request &req,
httplib::Response &res) {
auto name = req.get_param_value("name");
auto data = json({{
"value",
clean_json_value(name, config_.get_value_by_name(name)),
}});
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::ok;
}
void server::handle_set_config_value_by_name(const httplib::Request &req,
httplib::Response &res) {
auto name = req.get_param_value("name");
auto value = req.get_param_value("value");
json data = {{
"value",
clean_json_value(name, config_.set_value_by_name(name, value)),
}};
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::ok;
}
void server::handle_unmount(const httplib::Request & /*req*/,
httplib::Response &res) {
REPERTORY_USES_FUNCTION_NAME();
event_system::instance().raise<unmount_requested>(function_name);
res.status = http_error_codes::ok;
}
void server::initialize(httplib::Server &inst) {
inst.Get("/api/v1/" + rpc_method::get_config, [this](auto &&req, auto &&res) {
handle_get_config(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
inst.Get("/api/v1/" + rpc_method::get_config_value_by_name,
[this](auto &&req, auto &&res) {
handle_get_config_value_by_name(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
inst.Post("/api/v1/" + rpc_method::set_config_value_by_name,
[this](auto &&req, auto &&res) {
handle_set_config_value_by_name(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
inst.Post("/api/v1/" + rpc_method::unmount, [this](auto &&req, auto &&res) {
handle_unmount(std::forward<decltype(req)>(req),
std::forward<decltype(res)>(res));
});
}
void server::start() {
REPERTORY_USES_FUNCTION_NAME();
mutex_lock lock(start_stop_mutex_);
if (server_thread_) {
return;
}
event_system::instance().raise<service_start_begin>(function_name, "server");
server_ = std::make_unique<httplib::Server>();
server_->set_exception_handler([](const httplib::Request &req,
httplib::Response &res,
std::exception_ptr ptr) {
json data = {{"path", req.path}};
try {
std::rethrow_exception(ptr);
} catch (std::exception &e) {
data["error"] = (e.what() == nullptr) ? "unknown error" : e.what();
utils::error::raise_error(function_name, e,
"failed request: " + req.path);
} catch (...) {
data["error"] = "unknown error";
utils::error::raise_error(function_name, "unknown error",
"failed request: " + req.path);
}
res.set_content(data.dump(), "application/json");
res.status = http_error_codes::internal_error;
});
server_->set_pre_routing_handler(
[this](auto &&req, auto &&res) -> httplib::Server::HandlerResponse {
if (rpc::check_authorization(config_, req)) {
return httplib::Server::HandlerResponse::Unhandled;
}
res.status = http_error_codes::unauthorized;
return httplib::Server::HandlerResponse::Handled;
});
initialize(*server_);
server_thread_ = std::make_unique<std::thread>([this]() {
server_->set_socket_options([](auto &&sock) {
#if defined(_WIN32)
int enable{1};
setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
reinterpret_cast<const char *>(&enable), sizeof(enable));
#else // !defined(_WIN32)
linger opt{1, 0};
setsockopt(sock, SOL_SOCKET, SO_LINGER,
reinterpret_cast<const char *>(&opt), sizeof(opt));
#endif // defined(_WIN32)
});
server_->listen("127.0.0.1", config_.get_api_port());
});
event_system::instance().raise<service_start_end>(function_name, "server");
}
void server::stop() {
REPERTORY_USES_FUNCTION_NAME();
unique_mutex_lock lock(start_stop_mutex_);
if (not server_thread_) {
return;
}
event_system::instance().raise<service_stop_begin>(function_name, "server");
server_->stop();
std::unique_ptr<std::thread> thread{nullptr};
std::swap(thread, server_thread_);
lock.unlock();
thread->join();
thread.reset();
lock.lock();
server_.reset();
lock.unlock();
event_system::instance().raise<service_stop_end>(function_name, "server");
}
} // namespace repertory

View File

@ -23,6 +23,8 @@
#include "backward.hpp"
#endif // defined(PROJECT_ENABLE_BACKWARD_CPP)
#include <algorithm>
#include "cli/actions.hpp"
#include "initialize.hpp"
#include "types/repertory.hpp"
@ -44,7 +46,7 @@ auto main(int argc, char **argv) -> int {
std::vector<const char *> args;
{
auto args_span = std::span(argv, static_cast<std::size_t>(argc));
std::copy(args_span.begin(), args_span.end(), std::back_inserter(args));
std::ranges::copy(args_span, std::back_inserter(args));
}
if (argc == 1) {

View File

@ -326,9 +326,9 @@ void handlers::handle_put_mount_location(const httplib::Request &req,
void handlers::handle_get_available_locations(httplib::Response &res) {
#if defined(_WIN32)
constexpr const std::array<std::string_view, 26U> letters{
"A:", "B:", "C:", "D:", "E:", "F:", "G:", "H:", "I:",
"J:", "K:", "L:", "M:", "N:", "O:", "P:", "Q:", "R:",
"S:", "T:", "U:", "V:", "W:", "X:", "Y:", "Z:",
"a:", "b:", "c:", "d:", "e:", "f:", "g:", "h:", "i:",
"j:", "k:", "l:", "m:", "n:", "o:", "p:", "q:", "r:",
"s:", "t:", "u:", "v:", "w:", "x:", "y:", "z:",
};
auto available = std::accumulate(

View File

@ -54,21 +54,31 @@ namespace repertory {
struct local_s3 final {
static constexpr const provider_type type{provider_type::s3};
static constexpr const provider_type type2{provider_type::s3};
static constexpr const std::uint16_t port{0U};
};
struct local_sia final {
static constexpr const provider_type type{provider_type::sia};
static constexpr const provider_type type2{provider_type::sia};
static constexpr const std::uint16_t port{0U};
};
struct remote_s3 final {
static constexpr const provider_type type{provider_type::remote};
static constexpr const provider_type type2{provider_type::s3};
static constexpr const std::uint16_t port{0U};
};
struct remote_sia final {
static constexpr const provider_type type{provider_type::remote};
static constexpr const provider_type type2{provider_type::sia};
static constexpr const std::uint16_t port{0U};
};
struct remote_linux_to_winfsp final {
static constexpr const provider_type type{provider_type::remote};
static constexpr const provider_type type2{provider_type::unknown};
static constexpr const std::uint16_t port{40001U};
};
template <typename provider_t> class fuse_test : public ::testing::Test {
@ -113,7 +123,7 @@ protected:
auto r_cfg = config->get_remote_mount();
r_cfg.enable = true;
r_cfg.api_port = 30000U;
r_cfg.api_port = 40000U;
config->set_remote_mount(r_cfg);
}
@ -160,7 +170,7 @@ protected:
auto r_cfg = config->get_remote_mount();
r_cfg.enable = true;
r_cfg.api_port = 30000U;
r_cfg.api_port = 40000U;
config->set_remote_mount(r_cfg);
}
@ -178,7 +188,7 @@ protected:
execute_mount(drive_args, mount_location);
};
const auto mount_remote = [&]() {
const auto mount_remote = [&](std::uint16_t port = 40000U) {
{
mount_location2 = mount_location;
@ -187,7 +197,8 @@ protected:
{
"fuse_test",
app_config::get_provider_name(provider_t::type) + '_' +
app_config::get_provider_name(provider_t::type2),
app_config::get_provider_name(provider_t::type2) + '_' +
std::to_string(port),
});
mount_location = utils::path::combine(test_directory, {"mount"});
@ -206,7 +217,7 @@ protected:
"-dd",
config2->get_data_directory(),
"-rm",
"localhost:30000",
fmt::format("localhost:{}", port),
mount_location,
});
}
@ -233,6 +244,10 @@ protected:
mount_sia();
} break;
case provider_type::unknown:
mount_remote(provider_t::port);
return;
default:
throw std::runtime_error("remote provider type is not implemented");
return;
@ -410,9 +425,15 @@ std::string fuse_test<provider_t>::mount_location;
template <typename provider_t>
std::string fuse_test<provider_t>::mount_location2;
// using fuse_provider_types = ::testing::Types<local_s3, remote_s3>;
#if defined(__linux__)
using fuse_provider_types =
::testing::Types<local_s3, remote_s3, local_sia, remote_sia>;
// using fuse_provider_types =
// ::testing::Types<local_s3, remote_s3, local_sia, remote_sia,
// remote_linux_to_winfsp>;
#else // !defined(__linux__)
build fails here
#endif // defined(_WIN32)
} // namespace repertory
#endif // !defined(_WIN32)

View File

@ -45,21 +45,31 @@ namespace repertory {
struct local_s3 final {
static constexpr const provider_type type{provider_type::s3};
static constexpr const provider_type type2{provider_type::s3};
static constexpr const std::uint16_t port{0U};
};
struct local_sia final {
static constexpr const provider_type type{provider_type::sia};
static constexpr const provider_type type2{provider_type::sia};
static constexpr const std::uint16_t port{0U};
};
struct remote_s3 final {
static constexpr const provider_type type{provider_type::remote};
static constexpr const provider_type type2{provider_type::s3};
static constexpr const std::uint16_t port{0U};
};
struct remote_sia final {
static constexpr const provider_type type{provider_type::remote};
static constexpr const provider_type type2{provider_type::sia};
static constexpr const std::uint16_t port{0U};
};
struct remote_winfsp_to_linux final {
static constexpr const provider_type type{provider_type::remote};
static constexpr const provider_type type2{provider_type::unknown};
static constexpr const std::uint16_t port{40001U};
};
template <typename provider_t> class winfsp_test : public ::testing::Test {
@ -102,7 +112,7 @@ protected:
auto r_cfg = config->get_remote_mount();
r_cfg.enable = true;
r_cfg.api_port = 30000U;
r_cfg.api_port = 40000U;
config->set_remote_mount(r_cfg);
}
@ -144,7 +154,7 @@ protected:
auto r_cfg = config->get_remote_mount();
r_cfg.enable = true;
r_cfg.api_port = 30000U;
r_cfg.api_port = 40000U;
config->set_remote_mount(r_cfg);
}
@ -160,13 +170,15 @@ protected:
execute_mount(drive_args, mount_location);
};
const auto mount_remote = [&]() {
const auto mount_remote = [&](std::uint16_t port = 40000U) {
{
auto test_directory = utils::path::combine(
test::get_test_output_dir(),
{
"winfsp_test",
app_config::get_provider_name(provider_type::remote),
app_config::get_provider_name(provider_t::type) + '_' +
app_config::get_provider_name(provider_t::type2) + '_' +
std::to_string(port),
});
mount_location2 = mount_location;
@ -184,7 +196,7 @@ protected:
"-dd",
config->get_data_directory(),
"-rm",
"localhost:30000",
fmt::format("localhost:{}", port),
mount_location,
});
}
@ -211,6 +223,10 @@ protected:
mount_sia();
} break;
case provider_type::unknown:
mount_remote(provider_t::port);
return;
default:
throw std::runtime_error("remote provider type is not implemented");
return;
@ -228,7 +244,9 @@ protected:
static void TearDownTestCase() {
if (provider_t::type == provider_type::remote) {
execute_unmount(drive_args2, mount_location);
execute_unmount(drive_args, mount_location2);
if (provider_t::type2 != provider_type::unknown) {
execute_unmount(drive_args, mount_location2);
}
} else {
execute_unmount(drive_args, mount_location);
}
@ -282,7 +300,8 @@ std::string winfsp_test<provider_t>::mount_location2;
// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3,
// local_sia, remote_sia>;
using winfsp_provider_types = ::testing::Types<local_s3, remote_s3>;
// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3>;
using winfsp_provider_types = ::testing::Types<remote_winfsp_to_linux>;
} // namespace repertory
#endif // defined(_WIN32)