Create management portal in Flutter #39

Reviewed-on: #40

.cspell/words.txt

@@ -3,7 +3,6 @@ _mkgmtime
 _sh_denyno
 _sh_denyrd
 _sh_denyrw
-_spawnv
 aarch64
 advapi32
 armv8
@@ -115,7 +114,6 @@ googletest
 gpath
 gtest_version
 has_setxattr
-hkey
 httpapi
 httplib
 icudata
@@ -123,7 +121,6 @@ icui18n
 icuuc
 iostreams
 iphlpapi
-ipstream
 jthread
 libbitcoin
 libbitcoinsystem
@@ -145,7 +142,6 @@ libuuid_include_dirs
 libvlc
 linkflags
 localappdata
-lpbyte
 lptr
 lpwstr
 markdownlint
@@ -169,7 +165,6 @@ nuspell_version
 oleaut32
 openal_version
 openssldir
-pistream
 pkgconfig
 plarge_integer
 plex

CHANGELOG.md

@@ -4,16 +4,14 @@
 
 ### Issues
 
+* ~~\#12 [Unit Test] Complete all providers unit tests~~
+* ~~\#21 [Unit Test] Complete WinFSP unit tests~~
+* ~~\#22 [Unit Test] Complete FUSE unit tests~~
 * \#39 Create management portal in Flutter
 
 ### Changes from v2.0.4-rc
 
 * Continue documentation updates
-* Fixed `-status` command erasing active mount information
-* Fixed overlapping HTTP REST API port's
-* Refactored/fixed instance locking
-* Removed passwords and secret key values from API calls
-* Renamed setting `ApiAuth` to `ApiPassword`
 * Require `--name,-na` option for encryption provider
 
 ## v2.0.4-rc

README.md

@@ -8,8 +8,7 @@ on Windows.
 1. [Details and Features](#details-and-features)
 2. [Minimum Requirements](#minimum-requirements)
    1. [Supported Operating Systems](#supported-operating-systems)
-3. [GUI](#gui)
+3. [Usage](#usage)
-4. [Usage](#usage)
    1. [Important Options](#important-options)
    2. [Sia](#sia)
       * [Sia Initial Configuration](#sia-initial-configuration)
@@ -19,21 +18,21 @@ on Windows.
       * [S3 Initial Configuration](#s3-initial-configuration)
       * [S3 Mounting](#s3-mounting)
       * [S3 Configuration File](#s3-configuration-file)
-5. [Data Directories](#data-directories)
+4. [Data Directories](#data-directories)
    1. [Linux Directories](#linux-directories)
    2. [Windows Directories](#windows-directories)
-6. [Remote Mounting](#remote-mounting)
+5. [Remote Mounting](#remote-mounting)
    1. [Server Setup](#server-setup)
       * [Remote Mount Configuration File Section](#remote-mount-configuration-file-section)
    2. [Client Setup](#client-setup)
       * [Client Remote Mounting](#client-remote-mounting)
       * [Remote Mount Configuration File](#remote-mount-configuration-file)
-7. [Compiling](#compiling)
+6. [Compiling](#compiling)
    1. [Linux Compilation](#linux-compilation)
    2. [Windows Setup](#windows-compilation)
-8. [Credits](#credits)
+7. [Credits](#credits)
-9. [Developer Public Key](#developer-public-key)
+8. [Developer Public Key](#developer-public-key)
-10. [Consult the Wiki for additional information](https://git.fifthgrid.com/BlockStorage/repertory/wiki)
+9. [Consult the Wiki for additional information](https://git.fifthgrid.com/BlockStorage/repertory/wiki)
 
 ## Details and Features
 
@@ -58,24 +57,6 @@ Only 64-bit operating systems are supported
 * Linux `amd64`
 * Windows 64-bit 10, 11
 
-## GUI
-
-As of `v2.0.5-rc`, mounts can be managed using the `Repertory Management Portal`.
-To launch the portal, execute the following command:
-
-* `repertory -ui`
-  * The default username is `repertory`
-  * The default password is `repertory`
-
-After first launch, `ui.json` will be created in the appropriate data directory.
-See [Data Directories](#data-directories).
-You should modify this file directly or use the portal to change the default
-username and password.
-
-### Screenshot
- 
-<a href="https://ibb.co/fVyJqnbF"><img src="https://i.ibb.co/fVyJqnbF/repertory-portal.png" alt="repertory-portal" border="0"></a>
-
 ## Usage
 
 ### Important Options
@@ -151,7 +132,7 @@ username and password.
 
 ```json
 {
-  "ApiPassword": "<random generated rpc password>",
+  "ApiAuth": "<random generated rpc password>",
   "ApiPort": 10000,
   "ApiUser": "repertory",
   "DatabaseType": "rocksdb",
@@ -239,7 +220,7 @@ username and password.
 
 ```json
 {
-  "ApiPassword": "<random generated rpc password>",
+  "ApiAuth": "<random generated rpc password>",
   "ApiPort": 10100,
   "ApiUser": "repertory",
   "DatabaseType": "rocksdb",
@@ -379,7 +360,7 @@ for S3 providers.
 
 ```json
 {
-  "ApiPassword": "<random generated rpc password>",
+  "ApiAuth": "<random generated rpc password>",
   "ApiPort": 10010,
   "ApiUser": "repertory",
   "EnableDriveEvents": false,

repertory/librepertory/include/app_config.hpp

@@ -43,7 +43,8 @@ public:
   [[nodiscard]] static auto default_remote_api_port(const provider_type &prov)
       -> std::uint16_t;
 
-  [[nodiscard]] static auto default_rpc_port() -> std::uint16_t;
+  [[nodiscard]] static auto default_rpc_port(const provider_type &prov)
+      -> std::uint16_t;
 
   [[nodiscard]] static auto get_provider_display_name(const provider_type &prov)
       -> std::string;
@@ -72,7 +73,7 @@ public:
 
 private:
   provider_type prov_;
-  atomic<std::string> api_password_;
+  atomic<std::string> api_auth_;
   std::atomic<std::uint16_t> api_port_;
   atomic<std::string> api_user_;
   std::atomic<bool> config_changed_;
@@ -122,7 +123,7 @@ private:
   auto set_value(dest &dst, const source &src) -> bool;
 
 public:
-  [[nodiscard]] auto get_api_password() const -> std::string;
+  [[nodiscard]] auto get_api_auth() const -> std::string;
 
   [[nodiscard]] auto get_api_port() const -> std::uint16_t;
 
@@ -200,7 +201,7 @@ public:
 
   void save();
 
-  void set_api_password(const std::string &value);
+  void set_api_auth(const std::string &value);
 
   void set_api_port(std::uint16_t value);
 

repertory/librepertory/include/common.hpp

@@ -57,7 +57,7 @@ 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::uint64_t REPERTORY_CONFIG_VERSION = 2ULL;
+inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION = 1ULL;
 inline constexpr const std::string_view REPERTORY_DATA_NAME = "repertory2";
 inline constexpr const std::string_view REPERTORY_MIN_REMOTE_VERSION = "2.0.0";
 

repertory/librepertory/include/platform/platform.hpp

@@ -22,13 +22,6 @@
 #ifndef REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_
 #define REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_
 
-#include "types/repertory.hpp"
-
-namespace repertory {
-[[nodiscard]] auto create_lock_id(provider_type prov,
-                                  std::string_view unique_id)->std::string;
-}
-
 #if defined(_WIN32)
 #include "platform/win32_platform.hpp"
 #include "utils/windows.hpp"

repertory/librepertory/include/platform/unix_platform.hpp

@@ -30,45 +30,38 @@ class i_provider;
 
 class lock_data final {
 public:
-  lock_data(provider_type prov, std::string_view unique_id);
+  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/);
 
-  lock_data(const lock_data &) = delete;
+  lock_data();
-  lock_data(lock_data &&) = delete;
-
-  auto operator=(const lock_data &) -> lock_data & = delete;
-  auto operator=(lock_data &&) -> lock_data & = delete;
 
   ~lock_data();
 
 private:
-  std::string mutex_id_;
+  const provider_type pt_;
-
+  const std::string unique_id_;
-private:
+  const std::string mutex_id_;
-  int handle_{};
+  int lock_fd_;
-  int lock_status_{EWOULDBLOCK};
+  int lock_status_ = EWOULDBLOCK;
 
 private:
   [[nodiscard]] static auto get_state_directory() -> std::string;
 
-  [[nodiscard]] auto get_lock_data_file() const -> std::string;
+  [[nodiscard]] static auto get_lock_data_file() -> std::string;
 
-  [[nodiscard]] auto get_lock_file() const -> std::string;
+  [[nodiscard]] auto get_lock_file() -> std::string;
 
 private:
-  [[nodiscard]] static auto wait_for_lock(int handle,
+  [[nodiscard]] static auto
-                                          std::uint8_t retry_count = 30U)
+  wait_for_lock(int fd, std::uint8_t retry_count = 30u) -> int;
-      -> int;
 
 public:
   [[nodiscard]] auto get_mount_state(json &mount_state) -> bool;
 
-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30u) -> lock_result;
-
-  void release();
 
   [[nodiscard]] auto set_mount_state(bool active,
-                                     std::string_view mount_location, int pid)
+                                     const std::string &mount_location,
-      -> bool;
+                                     int pid) -> bool;
 };
 
 [[nodiscard]] auto create_meta_attributes(
@@ -83,5 +76,5 @@ public:
                                          const api_file &file) -> api_error;
 } // namespace repertory
 
-#endif // !defined(_WIN32)
+#endif // _WIN32
 #endif // REPERTORY_INCLUDE_PLATFORM_UNIXPLATFORM_HPP_

repertory/librepertory/include/platform/win32_platform.hpp

@@ -23,6 +23,7 @@
 #define REPERTORY_INCLUDE_PLATFORM_WINPLATFORM_HPP_
 #if defined(_WIN32)
 
+#include "app_config.hpp"
 #include "types/repertory.hpp"
 
 namespace repertory {
@@ -30,32 +31,43 @@ class i_provider;
 
 class lock_data final {
 public:
-  explicit lock_data(provider_type prov, std::string unique_id);
+  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
-  lock_data(const lock_data &) = delete;
+      : pt_(pt),
-  lock_data(lock_data &&) = delete;
+        unique_id_(std::move(unique_id)),
+        mutex_id_("repertory_" + app_config::get_provider_name(pt) + "_" +
+                  unique_id_),
+        mutex_handle_(::CreateMutex(nullptr, FALSE, &mutex_id_[0u])) {}
 
-  ~lock_data();
+  lock_data()
+      : pt_(provider_type::sia),
+        unique_id_(""),
+        mutex_id_(""),
+        mutex_handle_(INVALID_HANDLE_VALUE) {}
 
-  auto operator=(const lock_data &) -> lock_data & = delete;
+  ~lock_data() { release(); }
-  auto operator=(lock_data &&) -> lock_data & = delete;
 
 private:
-  std::string mutex_id_;
+  const provider_type pt_;
-  HANDLE mutex_handle_{INVALID_HANDLE_VALUE};
+  const std::string unique_id_;
-  DWORD mutex_state_{WAIT_FAILED};
+  const std::string mutex_id_;
-
+  HANDLE mutex_handle_;
-  [[nodiscard]] auto get_current_mount_state(json &mount_state) -> bool;
+  DWORD mutex_state_ = WAIT_FAILED;
 
 public:
+  [[nodiscard]] auto get_mount_state(const provider_type &pt,
+                                     json &mount_state) -> bool;
+
   [[nodiscard]] auto get_mount_state(json &mount_state) -> bool;
 
-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;
+  [[nodiscard]] auto get_unique_id() const -> std::string { return unique_id_; }
+
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30) -> lock_result;
 
   void release();
 
   [[nodiscard]] auto set_mount_state(bool active,
-                                     std::string_view mount_location,
+                                     const std::string &mount_location,
-                                     std::int64_t pid) -> bool;
+                                     const std::int64_t &pid) -> bool;
 };
 
 [[nodiscard]] auto create_meta_attributes(

repertory/librepertory/include/rpc/common.hpp

@@ -31,7 +31,7 @@ namespace repertory::rpc {
                                        const httplib::Request &req) -> bool {
   REPERTORY_USES_FUNCTION_NAME();
 
-  if (cfg.get_api_password().empty() || cfg.get_api_user().empty()) {
+  if (cfg.get_api_auth().empty() || cfg.get_api_user().empty()) {
     utils::error::raise_error(function_name,
                               "authorization user or password is not set");
     return false;
@@ -70,7 +70,7 @@ namespace repertory::rpc {
   auth.erase(auth.begin());
 
   auto pwd = utils::string::join(auth, ':');
-  if ((user != cfg.get_api_user()) || (pwd != cfg.get_api_password())) {
+  if ((user != cfg.get_api_user()) || (pwd != cfg.get_api_auth())) {
     utils::error::raise_error(function_name, "authorization failed");
     return false;
   }

repertory/librepertory/include/types/repertory.hpp

@@ -23,7 +23,7 @@
 #define REPERTORY_INCLUDE_TYPES_REPERTORY_HPP_
 
 namespace repertory {
-constexpr const auto default_api_password_size{48U};
+constexpr const auto default_api_auth_size{48U};
 constexpr const auto default_download_timeout_secs{30U};
 constexpr const auto default_eviction_delay_mins{1U};
 constexpr const auto default_high_freq_interval_secs{std::uint16_t{30U}};
@@ -314,11 +314,6 @@ provider_type_from_string(std::string_view type,
 
 [[nodiscard]] auto provider_type_to_string(provider_type type) -> std::string;
 
-void clean_json_config(provider_type prov, nlohmann::json &data);
-
-[[nodiscard]] auto clean_json_value(std::string_view name,
-                                    std::string_view data) -> std::string;
-
 #if defined(_WIN32)
 struct open_file_data final {
   PVOID directory_buffer{nullptr};
@@ -467,6 +462,7 @@ using meta_provider_callback = std::function<void(directory_item &)>;
 
 inline constexpr const auto JSON_ACCESS_KEY{"AccessKey"};
 inline constexpr const auto JSON_AGENT_STRING{"AgentString"};
+inline constexpr const auto JSON_API_AUTH{"ApiAuth"};
 inline constexpr const auto JSON_API_PARENT{"ApiParent"};
 inline constexpr const auto JSON_API_PASSWORD{"ApiPassword"};
 inline constexpr const auto JSON_API_PATH{"ApiPath"};

repertory/librepertory/src/app_config.cpp

@@ -66,8 +66,8 @@ void app_config::set_stop_requested() { stop_requested.store(true); }
 app_config::app_config(const provider_type &prov,
                        std::string_view data_directory)
     : prov_(prov),
-      api_password_(utils::generate_random_string(default_api_password_size)),
+      api_auth_(utils::generate_random_string(default_api_auth_size)),
-      api_port_(default_rpc_port()),
+      api_port_(default_rpc_port(prov)),
       api_user_(std::string{REPERTORY}),
       config_changed_(false),
       download_timeout_secs_(default_download_timeout_secs),
@@ -124,7 +124,7 @@ app_config::app_config(const provider_type &prov,
   }
 
   value_get_lookup_ = {
-      {JSON_API_PASSWORD, [this]() { return get_api_password(); }},
+      {JSON_API_AUTH, [this]() { return get_api_auth(); }},
       {JSON_API_PORT, [this]() { return std::to_string(get_api_port()); }},
       {JSON_API_USER, [this]() { return get_api_user(); }},
       {JSON_DATABASE_TYPE,
@@ -253,10 +253,10 @@ app_config::app_config(const provider_type &prov,
 
   value_set_lookup_ = {
       {
-          JSON_API_PASSWORD,
+          JSON_API_AUTH,
           [this](const std::string &value) {
-            set_api_password(value);
+            set_api_auth(value);
-            return get_api_password();
+            return get_api_auth();
           },
       },
       {
@@ -743,12 +743,20 @@ auto app_config::default_remote_api_port(const provider_type &prov)
   return PROVIDER_REMOTE_PORTS.at(static_cast<std::size_t>(prov));
 }
 
-auto app_config::default_rpc_port() -> std::uint16_t { return 10000U; }
+auto app_config::default_rpc_port(const provider_type &prov) -> std::uint16_t {
-
+  static const std::array<std::uint16_t,
-auto app_config::get_api_password() const -> std::string {
+                          static_cast<std::size_t>(provider_type::unknown)>
-  return api_password_;
+      PROVIDER_RPC_PORTS = {
+          10000U,
+          10010U,
+          10100U,
+          10002U,
+      };
+  return PROVIDER_RPC_PORTS.at(static_cast<std::size_t>(prov));
 }
 
+auto app_config::get_api_auth() const -> std::string { return api_auth_; }
+
 auto app_config::get_api_port() const -> std::uint16_t { return api_port_; }
 
 auto app_config::get_api_user() const -> std::string { return api_user_; }
@@ -808,7 +816,7 @@ auto app_config::get_host_config() const -> host_config { return host_config_; }
 
 auto app_config::get_json() const -> json {
   json ret = {
-      {JSON_API_PASSWORD, api_password_},
+      {JSON_API_AUTH, api_auth_},
       {JSON_API_PORT, api_port_},
       {JSON_API_USER, api_user_},
       {JSON_DOWNLOAD_TIMEOUT_SECS, download_timeout_secs_},
@@ -933,18 +941,24 @@ auto app_config::get_preferred_download_type() const -> download_type {
 auto app_config::get_provider_display_name(const provider_type &prov)
     -> std::string {
   static const std::array<std::string,
-                          static_cast<std::size_t>(provider_type::unknown) + 1U>
+                          static_cast<std::size_t>(provider_type::unknown)>
       PROVIDER_DISPLAY_NAMES = {
-          "Sia", "Remote", "S3", "Encrypt", "Unknown",
+          "Sia",
+          "Remote",
+          "S3",
+          "Encrypt",
       };
   return PROVIDER_DISPLAY_NAMES.at(static_cast<std::size_t>(prov));
 }
 
 auto app_config::get_provider_name(const provider_type &prov) -> std::string {
   static const std::array<std::string,
-                          static_cast<std::size_t>(provider_type::unknown) + 1U>
+                          static_cast<std::size_t>(provider_type::unknown)>
       PROVIDER_NAMES = {
-          "sia", "remote", "s3", "encrypt", "unknown",
+          "sia",
+          "remote",
+          "s3",
+          "encrypt",
       };
   return PROVIDER_NAMES.at(static_cast<std::size_t>(prov));
 }
@@ -1023,7 +1037,7 @@ auto app_config::load() -> bool {
     auto found{true};
     auto json_document = json::parse(json_text);
 
-    get_value(json_document, JSON_API_PASSWORD, api_password_, found);
+    get_value(json_document, JSON_API_AUTH, api_auth_, found);
     get_value(json_document, JSON_API_PORT, api_port_, found);
     get_value(json_document, JSON_API_USER, api_user_, found);
     get_value(json_document, JSON_DATABASE_TYPE, db_type_, found);
@@ -1080,13 +1094,6 @@ auto app_config::load() -> bool {
           set_value(max_cache_size_bytes_, default_max_cache_size_bytes);
         }
       }
-
-      if (version_ == 2U) {
-        if (json_document.contains("ApiAuth")) {
-          api_password_ = json_document.at("ApiAuth").get<std::string>();
-        }
-      }
-
       found = false;
     }
 
@@ -1125,8 +1132,8 @@ void app_config::save() {
   });
 }
 
-void app_config::set_api_password(const std::string &value) {
+void app_config::set_api_auth(const std::string &value) {
-  set_value(api_password_, value);
+  set_value(api_auth_, value);
 }
 
 void app_config::set_api_port(std::uint16_t value) {

repertory/librepertory/src/platform/unix_platform.cpp

@@ -21,8 +21,9 @@
 */
 #if !defined(_WIN32)
 
-#include "platform/platform.hpp"
+#include "platform/unix_platform.hpp"
 
+#include "app_config.hpp"
 #include "events/event_system.hpp"
 #include "events/types/filesystem_item_added.hpp"
 #include "providers/i_provider.hpp"
@@ -35,65 +36,61 @@
 #include "utils/unix.hpp"
 
 namespace repertory {
-lock_data::lock_data(provider_type prov, std::string_view unique_id)
+lock_data::lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
-    : mutex_id_(create_lock_id(prov, unique_id)) {
+    : pt_(pt),
-  handle_ = open(get_lock_file().c_str(), O_CREAT | O_RDWR, S_IWUSR | S_IRUSR);
+      unique_id_(std::move(unique_id)),
+      mutex_id_("repertory_" + app_config::get_provider_name(pt) + "_" +
+                unique_id_) {
+  lock_fd_ = open(get_lock_file().c_str(), O_CREAT | O_RDWR, S_IWUSR | S_IRUSR);
 }
 
-lock_data::~lock_data() { release(); }
+lock_data::lock_data()
+    : pt_(provider_type::sia), unique_id_(""), mutex_id_(""), lock_fd_(-1) {}
 
-auto lock_data::get_lock_data_file() const -> std::string {
+lock_data::~lock_data() {
-  auto dir = get_state_directory();
+  if (lock_fd_ != -1) {
+    if (lock_status_ == 0) {
+      unlink(get_lock_file().c_str());
+      flock(lock_fd_, LOCK_UN);
+    }
+
+    close(lock_fd_);
+  }
+}
+
+auto lock_data::get_lock_data_file() -> std::string {
+  const auto dir = get_state_directory();
+  if (not utils::file::directory(dir).create_directory()) {
+    throw startup_exception("failed to create directory|sp|" + dir + "|err|" +
+                            std::to_string(utils::get_last_error_code()));
+  }
+  return utils::path::combine(
+      dir, {"mountstate_" + std::to_string(getuid()) + ".json"});
+}
+
+auto lock_data::get_lock_file() -> std::string {
+  const auto dir = get_state_directory();
   if (not utils::file::directory(dir).create_directory()) {
     throw startup_exception("failed to create directory|sp|" + dir + "|err|" +
                             std::to_string(utils::get_last_error_code()));
   }
 
-  return utils::path::combine(
+  return utils::path::combine(dir,
-      dir, {
+                              {mutex_id_ + "_" + std::to_string(getuid())});
-               fmt::format("{}_{}.json", mutex_id_, getuid()),
-           });
-}
-
-auto lock_data::get_lock_file() const -> std::string {
-  auto dir = get_state_directory();
-  if (not utils::file::directory(dir).create_directory()) {
-    throw startup_exception("failed to create directory|sp|" + dir + "|err|" +
-                            std::to_string(utils::get_last_error_code()));
-  }
-
-  return utils::path::combine(
-      dir, {
-               fmt::format("{}_{}.lock", mutex_id_, getuid()),
-           });
 }
 
 auto lock_data::get_mount_state(json &mount_state) -> bool {
-  auto handle = open(get_lock_data_file().c_str(), O_RDWR, S_IWUSR | S_IRUSR);
+  auto ret = false;
-  if (handle == -1) {
+  auto fd =
-    mount_state = {
+      open(get_lock_data_file().c_str(), O_CREAT | O_RDWR, S_IWUSR | S_IRUSR);
-        {"Active", false},
+  if (fd != -1) {
-        {"Location", ""},
+    if (wait_for_lock(fd) == 0) {
-        {"PID", -1},
+      ret = utils::file::read_json_file(get_lock_data_file(), mount_state);
-    };
+      flock(fd, LOCK_UN);
-
-    return true;
-  }
-
-  auto ret{false};
-  if (wait_for_lock(handle) == 0) {
-    ret = utils::file::read_json_file(get_lock_data_file(), mount_state);
-    if (ret && mount_state.empty()) {
-      mount_state = {
-          {"Active", false},
-          {"Location", ""},
-          {"PID", -1},
-      };
     }
-    flock(handle, LOCK_UN);
-  }
 
-  close(handle);
+    close(fd);
+  }
   return ret;
 }
 
@@ -101,20 +98,25 @@ auto lock_data::get_state_directory() -> std::string {
 #if defined(__APPLE__)
   return utils::path::absolute("~/Library/Application Support/" +
                                std::string{REPERTORY_DATA_NAME} + "/state");
-#else  // !defined(__APPLE__)
+#else
   return utils::path::absolute("~/.local/" + std::string{REPERTORY_DATA_NAME} +
                                "/state");
-#endif // defined(__APPLE__)
+#endif
 }
 
 auto lock_data::grab_lock(std::uint8_t retry_count) -> lock_result {
-  if (handle_ == -1) {
+  REPERTORY_USES_FUNCTION_NAME();
+
+  if (lock_fd_ == -1) {
     return lock_result::failure;
   }
 
-  lock_status_ = wait_for_lock(handle_, retry_count);
+  lock_status_ = wait_for_lock(lock_fd_, retry_count);
   switch (lock_status_) {
   case 0:
+    if (not set_mount_state(false, "", -1)) {
+      utils::error::raise_error(function_name, "failed to set mount state");
+    }
     return lock_result::success;
   case EWOULDBLOCK:
     return lock_result::locked;
@@ -123,72 +125,61 @@ auto lock_data::grab_lock(std::uint8_t retry_count) -> lock_result {
   }
 }
 
-void lock_data::release() {
+auto lock_data::set_mount_state(bool active, const std::string &mount_location,
-  if (handle_ == -1) {
-    return;
-  }
-
-  if (lock_status_ == 0) {
-    [[maybe_unused]] auto success{utils::file::file{get_lock_file()}.remove()};
-    flock(handle_, LOCK_UN);
-  }
-
-  close(handle_);
-  handle_ = -1;
-}
-
-auto lock_data::set_mount_state(bool active, std::string_view mount_location,
                                 int pid) -> bool {
   REPERTORY_USES_FUNCTION_NAME();
 
+  auto ret = false;
   auto handle =
       open(get_lock_data_file().c_str(), O_CREAT | O_RDWR, S_IWUSR | S_IRUSR);
-  if (handle == -1) {
+  if (handle != -1) {
-    return false;
+    if (wait_for_lock(handle) == 0) {
-  }
+      const auto mount_id =
-
+          app_config::get_provider_display_name(pt_) + unique_id_;
-  auto ret{false};
+      json mount_state;
-  if (wait_for_lock(handle) == 0) {
+      if (not utils::file::read_json_file(get_lock_data_file(), mount_state)) {
-    json mount_state;
+        utils::error::raise_error(function_name,
-    if (not utils::file::read_json_file(get_lock_data_file(), mount_state)) {
+                                  "failed to read mount state file|sp|" +
-      utils::error::raise_error(function_name,
+                                      get_lock_file());
-                                "failed to read mount state file|sp|" +
-                                    get_lock_file());
-    }
-    if ((mount_state.find("Active") == mount_state.end()) ||
-        (mount_state["Active"].get<bool>() != active) ||
-        (active &&
-         ((mount_state.find("Location") == mount_state.end()) ||
-          (mount_state["Location"].get<std::string>() != mount_location)))) {
-      if (mount_location.empty() && not active) {
-        ret = utils::file::file{get_lock_data_file()}.remove();
-      } else {
-        ret = utils::file::write_json_file(
-            get_lock_data_file(),
-            {
-                {"Active", active},
-                {"Location", active ? mount_location : ""},
-                {"PID", active ? pid : -1},
-            });
       }
-    } else {
+      if ((mount_state.find(mount_id) == mount_state.end()) ||
-      ret = true;
+          (mount_state[mount_id].find("Active") ==
+           mount_state[mount_id].end()) ||
+          (mount_state[mount_id]["Active"].get<bool>() != active) ||
+          (active && ((mount_state[mount_id].find("Location") ==
+                       mount_state[mount_id].end()) ||
+                      (mount_state[mount_id]["Location"].get<std::string>() !=
+                       mount_location)))) {
+        const auto lines = utils::file::read_file_lines(get_lock_data_file());
+        const auto txt = std::accumulate(
+            lines.begin(), lines.end(), std::string(),
+            [](auto &&val, auto &&line) -> auto { return val + line; });
+        auto json_data = json::parse(txt.empty() ? "{}" : txt);
+        json_data[mount_id] = {
+            {"Active", active},
+            {"Location", active ? mount_location : ""},
+            {"PID", active ? pid : -1},
+        };
+        ret = utils::file::write_json_file(get_lock_data_file(), json_data);
+      } else {
+        ret = true;
+      }
+
+      flock(handle, LOCK_UN);
     }
 
-    flock(handle, LOCK_UN);
+    close(handle);
   }
-
-  close(handle);
   return ret;
 }
 
-auto lock_data::wait_for_lock(int handle, std::uint8_t retry_count) -> int {
+auto lock_data::wait_for_lock(int fd, std::uint8_t retry_count) -> int {
-  static constexpr const std::uint32_t max_sleep{100U};
+  static constexpr const std::uint32_t max_sleep = 100U;
 
-  auto lock_status{EWOULDBLOCK};
+  auto lock_status = EWOULDBLOCK;
-  auto remain{static_cast<std::uint32_t>(retry_count * max_sleep)};
+  auto remain = static_cast<std::uint32_t>(retry_count * max_sleep);
   while ((remain > 0) && (lock_status == EWOULDBLOCK)) {
-    lock_status = flock(handle, LOCK_EX | LOCK_NB);
+    lock_status = flock(fd, LOCK_EX | LOCK_NB);
     if (lock_status == -1) {
       lock_status = errno;
       if (lock_status == EWOULDBLOCK) {
@@ -237,13 +228,13 @@ auto provider_meta_handler(i_provider &provider, bool directory,
                            const api_file &file) -> api_error {
   REPERTORY_USES_FUNCTION_NAME();
 
-  auto meta = create_meta_attributes(
+  const auto meta = create_meta_attributes(
       file.accessed_date,
       directory ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_ARCHIVE,
       file.changed_date, file.creation_date, directory, getgid(), file.key,
       directory ? S_IFDIR | S_IRUSR | S_IWUSR | S_IXUSR
                 : S_IFREG | S_IRUSR | S_IWUSR,
-      file.modified_date, 0U, 0U, file.file_size, file.source_path, getuid(),
+      file.modified_date, 0u, 0u, file.file_size, file.source_path, getuid(),
       file.modified_date);
   auto res = provider.set_item_meta(file.api_path, meta);
   if (res == api_error::success) {

repertory/librepertory/src/platform/win32_platform.cpp

@@ -21,171 +21,150 @@
 */
 #if defined(_WIN32)
 
-#include "platform/platform.hpp"
+#include "platform/win32_platform.hpp"
 
 #include "events/event_system.hpp"
 #include "events/types/filesystem_item_added.hpp"
 #include "providers/i_provider.hpp"
-#include "utils/config.hpp"
 #include "utils/error_utils.hpp"
 #include "utils/string.hpp"
 
 namespace repertory {
-lock_data::lock_data(provider_type prov, std::string unique_id)
+auto lock_data::get_mount_state(const provider_type & /*pt*/, json &mount_state)
-    : mutex_id_(create_lock_id(prov, unique_id)),
+    -> bool {
-      mutex_handle_(::CreateMutex(nullptr, FALSE,
+  const auto ret = get_mount_state(mount_state);
-                                  create_lock_id(prov, unique_id).c_str())) {}
+  if (ret) {
-
+    const auto mount_id =
-lock_data::~lock_data() { release(); }
+        app_config::get_provider_display_name(pt_) + unique_id_;
-
+    mount_state = mount_state[mount_id].empty()
-auto lock_data::get_current_mount_state(json &mount_state) -> bool {
+                      ? json({{"Active", false}, {"Location", ""}, {"PID", -1}})
-  REPERTORY_USES_FUNCTION_NAME();
+                      : mount_state[mount_id];
-
-  HKEY key{};
-  if (::RegOpenKeyEx(HKEY_CURRENT_USER,
-                     fmt::format(R"(SOFTWARE\{}\Mounts\{})",
-                                 REPERTORY_DATA_NAME, mutex_id_)
-                         .c_str(),
-                     0, KEY_ALL_ACCESS, &key) != ERROR_SUCCESS) {
-    return true;
   }
 
-  std::string data;
-  DWORD data_size{};
-
-  DWORD type{REG_SZ};
-  ::RegGetValueA(key, nullptr, nullptr, RRF_RT_REG_SZ, &type, nullptr,
-                 &data_size);
-
-  data.resize(data_size);
-  auto res = ::RegGetValueA(key, nullptr, nullptr, RRF_RT_REG_SZ, &type,
-                            data.data(), &data_size);
-  auto ret = res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND;
-  if (ret && data_size != 0U) {
-    try {
-      mount_state = json::parse(data);
-    } catch (const std::exception &e) {
-      utils::error::raise_error(function_name, e, "failed to read mount state");
-      ret = false;
-    }
-  }
-
-  ::RegCloseKey(key);
   return ret;
 }
 
 auto lock_data::get_mount_state(json &mount_state) -> bool {
-  if (not get_current_mount_state(mount_state)) {
+  HKEY key;
-    return false;
+  auto ret = !::RegCreateKeyEx(
+      HKEY_CURRENT_USER,
+      ("SOFTWARE\\" + std::string{REPERTORY_DATA_NAME} + "\\Mounts").c_str(), 0,
+      nullptr, 0, KEY_ALL_ACCESS, nullptr, &key, nullptr);
+  if (ret) {
+    DWORD i = 0u;
+    DWORD data_size = 0u;
+    std::string name;
+    name.resize(32767u);
+    auto name_size = static_cast<DWORD>(name.size());
+    while (ret &&
+           (::RegEnumValue(key, i, &name[0], &name_size, nullptr, nullptr,
+                           nullptr, &data_size) == ERROR_SUCCESS)) {
+      std::string data;
+      data.resize(data_size);
+      name_size++;
+      if ((ret = !::RegEnumValue(key, i++, &name[0], &name_size, nullptr,
+                                 nullptr, reinterpret_cast<LPBYTE>(&data[0]),
+                                 &data_size))) {
+        mount_state[name.c_str()] = json::parse(data);
+        name_size = static_cast<DWORD>(name.size());
+        data_size = 0u;
+      }
+    }
+    ::RegCloseKey(key);
   }
-
+  return ret;
-  mount_state = mount_state.empty() ? json({
-                                          {"Active", false},
-                                          {"Location", ""},
-                                          {"PID", -1},
-                                      })
-                                    : mount_state;
-
-  return true;
 }
 
 auto lock_data::grab_lock(std::uint8_t retry_count) -> lock_result {
-  static constexpr const std::uint32_t max_sleep{100U};
+  REPERTORY_USES_FUNCTION_NAME();
 
+  auto ret = lock_result::success;
   if (mutex_handle_ == INVALID_HANDLE_VALUE) {
-    return lock_result::failure;
+    ret = lock_result::failure;
+  } else {
+    for (auto i = 0;
+         (i <= retry_count) && ((mutex_state_ = ::WaitForSingleObject(
+                                     mutex_handle_, 100)) == WAIT_TIMEOUT);
+         i++) {
+    }
+
+    switch (mutex_state_) {
+    case WAIT_OBJECT_0: {
+      ret = lock_result::success;
+      auto should_reset = true;
+      json mount_state;
+      if (get_mount_state(pt_, mount_state)) {
+        if (mount_state["Active"].get<bool>() &&
+            mount_state["Location"] == "elevating") {
+          should_reset = false;
+        }
+      }
+
+      if (should_reset) {
+        if (not set_mount_state(false, "", -1)) {
+          utils::error::raise_error(function_name, "failed to set mount state");
+        }
+      }
+    } break;
+
+    case WAIT_TIMEOUT:
+      ret = lock_result::locked;
+      break;
+
+    default:
+      ret = lock_result::failure;
+      break;
+    }
   }
 
-  for (std::uint8_t idx = 0U;
+  return ret;
-       (idx <= retry_count) &&
-       ((mutex_state_ = ::WaitForSingleObject(mutex_handle_, max_sleep)) ==
-        WAIT_TIMEOUT);
-       ++idx) {
-  }
-
-  switch (mutex_state_) {
-  case WAIT_OBJECT_0:
-    return lock_result::success;
-
-  case WAIT_TIMEOUT:
-    return lock_result::locked;
-
-  default:
-    return lock_result::failure;
-  }
 }
 
 void lock_data::release() {
-  if (mutex_handle_ == INVALID_HANDLE_VALUE) {
+  if (mutex_handle_ != INVALID_HANDLE_VALUE) {
-    return;
+    if ((mutex_state_ == WAIT_OBJECT_0) || (mutex_state_ == WAIT_ABANDONED)) {
-  }
+      ::ReleaseMutex(mutex_handle_);
-
-  if ((mutex_state_ == WAIT_OBJECT_0) || (mutex_state_ == WAIT_ABANDONED)) {
-    if (mutex_state_ == WAIT_OBJECT_0) {
-      [[maybe_unused]] auto success{set_mount_state(false, "", -1)};
     }
-
+    ::CloseHandle(mutex_handle_);
-    ::ReleaseMutex(mutex_handle_);
+    mutex_handle_ = INVALID_HANDLE_VALUE;
   }
-
-  ::CloseHandle(mutex_handle_);
-  mutex_handle_ = INVALID_HANDLE_VALUE;
 }
 
-auto lock_data::set_mount_state(bool active, std::string_view mount_location,
+auto lock_data::set_mount_state(bool active, const std::string &mount_location,
-                                std::int64_t pid) -> bool {
+                                const std::int64_t &pid) -> bool {
-  if (mutex_handle_ == INVALID_HANDLE_VALUE) {
+  auto ret = false;
-    return false;
+  if (mutex_handle_ != INVALID_HANDLE_VALUE) {
-  }
+    const auto mount_id =
-
+        app_config::get_provider_display_name(pt_) + unique_id_;
-  json mount_state;
+    json mount_state;
-  [[maybe_unused]] auto success{get_mount_state(mount_state)};
+    [[maybe_unused]] auto success = get_mount_state(mount_state);
-  if (not((mount_state.find("Active") == mount_state.end()) ||
+    if ((mount_state.find(mount_id) == mount_state.end()) ||
-          (mount_state["Active"].get<bool>() != active) ||
+        (mount_state[mount_id].find("Active") == mount_state[mount_id].end()) ||
-          (active &&
+        (mount_state[mount_id]["Active"].get<bool>() != active) ||
-           ((mount_state.find("Location") == mount_state.end()) ||
+        (active && ((mount_state[mount_id].find("Location") ==
-            (mount_state["Location"].get<std::string>() != mount_location))))) {
+                     mount_state[mount_id].end()) ||
-    return true;
+                    (mount_state[mount_id]["Location"].get<std::string>() !=
-  }
+                     mount_location)))) {
-
+      HKEY key;
-  HKEY key{};
+      if ((ret = !::RegCreateKeyEx(
-  if (::RegCreateKeyExA(HKEY_CURRENT_USER,
+               HKEY_CURRENT_USER,
-                        fmt::format(R"(SOFTWARE\{}\Mounts\{})",
+               ("SOFTWARE\\" + std::string{REPERTORY_DATA_NAME} + "\\Mounts")
-                                    REPERTORY_DATA_NAME, mutex_id_)
+                   .c_str(),
-                            .c_str(),
+               0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key, nullptr))) {
-                        0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key,
+        const auto str = json({{"Active", active},
-                        nullptr) != ERROR_SUCCESS) {
+                               {"Location", active ? mount_location : ""},
-    return false;
+                               {"PID", active ? pid : -1}})
-  }
+                             .dump(0);
-
+        ret = !::RegSetValueEx(key, &mount_id[0], 0, REG_SZ,
-  auto ret{false};
+                               reinterpret_cast<const BYTE *>(&str[0]),
-  if (mount_location.empty() && not active) {
+                               static_cast<DWORD>(str.size()));
-    ::RegCloseKey(key);
+        ::RegCloseKey(key);
-
+      }
-    if (::RegCreateKeyExA(
+    } else {
-            HKEY_CURRENT_USER,
+      ret = true;
-            fmt::format(R"(SOFTWARE\{}\Mounts)", REPERTORY_DATA_NAME).c_str(),
-            0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key,
-            nullptr) != ERROR_SUCCESS) {
-      return false;
     }
-
-    ret = (::RegDeleteKeyA(key, mutex_id_.c_str()) == ERROR_SUCCESS);
-  } else {
-    auto data{
-        json({
-                 {"Active", active},
-                 {"Location", active ? mount_location : ""},
-                 {"PID", active ? pid : -1},
-             })
-            .dump(),
-    };
-    ret = (::RegSetValueEx(key, nullptr, 0, REG_SZ,
-                           reinterpret_cast<const BYTE *>(data.c_str()),
-                           static_cast<DWORD>(data.size())) == ERROR_SUCCESS);
   }
 
-  ::RegCloseKey(key);
   return ret;
 }
 
@@ -236,4 +215,4 @@ auto provider_meta_handler(i_provider &provider, bool directory,
 }
 } // namespace repertory
 
-#endif // defined(_WIN32)
+#endif //_WIN32

repertory/librepertory/src/rpc/server/server.cpp

@@ -29,7 +29,9 @@
 #include "events/types/service_stop_end.hpp"
 #include "events/types/unmount_requested.hpp"
 #include "rpc/common.hpp"
+#include "utils/base64.hpp"
 #include "utils/error_utils.hpp"
+#include "utils/string.hpp"
 
 namespace repertory {
 server::server(app_config &config) : config_(config) {}
@@ -37,7 +39,6 @@ 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;
 }
@@ -45,10 +46,7 @@ void server::handle_get_config(const httplib::Request & /*req*/,
 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({{
+  auto data = json({{"value", config_.get_value_by_name(name)}});
-      "value",
-      clean_json_value(name, config_.get_value_by_name(name)),
-  }});
   res.set_content(data.dump(), "application/json");
   res.status = http_error_codes::ok;
 }
@@ -58,10 +56,7 @@ void server::handle_set_config_value_by_name(const httplib::Request &req,
   auto name = req.get_param_value("name");
   auto value = req.get_param_value("value");
 
-  json data = {{
+  json data = {{"value", config_.set_value_by_name(name, value)}};
-      "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;
 }
@@ -141,21 +136,8 @@ void server::start() {
 
   initialize(*server_);
 
-  server_thread_ = std::make_unique<std::thread>([this]() {
+  server_thread_ = std::make_unique<std::thread>(
-    server_->set_socket_options([](auto &&sock) {
+      [this]() { server_->listen("127.0.0.1", config_.get_api_port()); });
-#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");
 }
 

repertory/librepertory/src/types/repertory.cpp

@@ -26,51 +26,6 @@
 #include "utils/string.hpp"
 
 namespace repertory {
-void clean_json_config(provider_type prov, nlohmann::json &data) {
-  data[JSON_API_PASSWORD] = "";
-
-  switch (prov) {
-  case provider_type::encrypt:
-    data[JSON_ENCRYPT_CONFIG][JSON_ENCRYPTION_TOKEN] = "";
-    data[JSON_REMOTE_MOUNT][JSON_ENCRYPTION_TOKEN] = "";
-    break;
-
-  case provider_type::remote:
-    data[JSON_REMOTE_CONFIG][JSON_ENCRYPTION_TOKEN] = "";
-    break;
-
-  case provider_type::s3:
-    data[JSON_REMOTE_MOUNT][JSON_ENCRYPTION_TOKEN] = "";
-    data[JSON_S3_CONFIG][JSON_ENCRYPTION_TOKEN] = "";
-    data[JSON_S3_CONFIG][JSON_SECRET_KEY] = "";
-    break;
-
-  case provider_type::sia:
-    data[JSON_REMOTE_MOUNT][JSON_ENCRYPTION_TOKEN] = "";
-    data[JSON_HOST_CONFIG][JSON_API_PASSWORD] = "";
-
-    break;
-  default:
-    return;
-  }
-}
-
-auto clean_json_value(std::string_view name, std::string_view data)
-    -> std::string {
-  if (name ==
-          fmt::format("{}.{}", JSON_ENCRYPT_CONFIG, JSON_ENCRYPTION_TOKEN) ||
-      name == fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_API_PASSWORD) ||
-      name == fmt::format("{}.{}", JSON_REMOTE_CONFIG, JSON_ENCRYPTION_TOKEN) ||
-      name == fmt::format("{}.{}", JSON_REMOTE_MOUNT, JSON_ENCRYPTION_TOKEN) ||
-      name == fmt::format("{}.{}", JSON_S3_CONFIG, JSON_ENCRYPTION_TOKEN) ||
-      name == fmt::format("{}.{}", JSON_S3_CONFIG, JSON_SECRET_KEY) ||
-      name == JSON_API_PASSWORD) {
-    return "";
-  }
-
-  return std::string{data};
-}
-
 auto database_type_from_string(std::string type, database_type default_type)
     -> database_type {
   type = utils::string::to_lower(utils::string::trim(type));

repertory/librepertory/src/utils/cli_utils.cpp

@@ -45,7 +45,7 @@ void get_api_authentication_data(std::string &user, std::string &password,
 
   if (success) {
     if (user.empty() && password.empty()) {
-      password = data[JSON_API_PASSWORD].get<std::string>();
+      password = data[JSON_API_AUTH].get<std::string>();
       user = data[JSON_API_USER].get<std::string>();
     }
     port = data[JSON_API_PORT].get<std::uint16_t>();

repertory/librepertory/src/utils/platform.cpp

@@ -1,31 +0,0 @@
-/*
-  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 "platform/platform.hpp"
-
-#include "app_config.hpp"
-
-namespace repertory {
-auto create_lock_id(provider_type prov, std::string_view unique_id)->std::string {
-  return fmt::format("{}_{}_{}", REPERTORY_DATA_NAME,
-                     app_config::get_provider_name(prov), unique_id);
-}
-} // namespace repertory

repertory/repertory/include/cli/mount.hpp

@@ -28,13 +28,14 @@
 #include "providers/provider.hpp"
 #include "types/repertory.hpp"
 #include "utils/cli_utils.hpp"
-#include "utils/file.hpp"
+#include "utils/com_init_wrapper.hpp"
+#include "utils/file_utils.hpp"
+#include "utils/string.hpp"
 
 #if defined(_WIN32)
 #include "drives/winfsp/remotewinfsp/remote_client.hpp"
 #include "drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp"
 #include "drives/winfsp/winfsp_drive.hpp"
-#include "utils/com_init_wrapper.hpp"
 
 using repertory_drive = repertory::winfsp_drive;
 using remote_client = repertory::remote_winfsp::remote_client;
@@ -56,143 +57,130 @@ namespace repertory::cli::actions {
 mount(std::vector<const char *> args, std::string data_directory,
       int &mount_result, provider_type prov, const std::string &remote_host,
       std::uint16_t remote_port, const std::string &unique_id) -> exit_code {
-  lock_data global_lock(provider_type::unknown, "global");
+  auto ret = exit_code::success;
-  {
-    auto lock_result = global_lock.grab_lock(100U);
-    if (lock_result != lock_result::success) {
-      std::cerr << "FATAL: Unable to get global lock" << std::endl;
-      return exit_code::lock_failed;
-    }
-  }
 
   lock_data lock(prov, unique_id);
-  auto lock_result = lock.grab_lock();
+  const auto res = lock.grab_lock();
-  if (lock_result == lock_result::locked) {
+  if (res == lock_result::locked) {
+    ret = exit_code::mount_active;
     std::cerr << app_config::get_provider_display_name(prov)
               << " mount is already active" << std::endl;
-    return exit_code::mount_active;
+  } else if (res == lock_result::success) {
-  }
+    const auto generate_config = utils::cli::has_option(
-
+        args, utils::cli::options::generate_config_option);
-  if (lock_result != lock_result::success) {
+    if (generate_config) {
-    std::cerr << "FATAL: Unable to get provider lock" << std::endl;
+      app_config config(prov, data_directory);
-    return exit_code::lock_failed;
+      if (prov == provider_type::remote) {
-  }
+        auto cfg = config.get_remote_config();
-
+        cfg.host_name_or_ip = remote_host;
-  if (utils::cli::has_option(args,
+        cfg.api_port = remote_port;
-                             utils::cli::options::generate_config_option)) {
+        config.set_remote_config(cfg);
-    app_config config(prov, data_directory);
+      } else if (prov == provider_type::sia &&
-    if (prov == provider_type::remote) {
+                 config.get_sia_config().bucket.empty()) {
-      auto remote_config = config.get_remote_config();
+        [[maybe_unused]] auto bucket =
-      remote_config.host_name_or_ip = remote_host;
+            config.set_value_by_name("SiaConfig.Bucket", unique_id);
-      remote_config.api_port = remote_port;
-      config.set_remote_config(remote_config);
-    } else if (prov == provider_type::sia &&
-               config.get_sia_config().bucket.empty()) {
-      [[maybe_unused]] auto bucket =
-          config.set_value_by_name("SiaConfig.Bucket", unique_id);
-    }
-
-    std::cout << "Generated " << app_config::get_provider_display_name(prov)
-              << " Configuration" << std::endl;
-    std::cout << config.get_config_file_path() << std::endl;
-    return utils::file::file(config.get_config_file_path()).exists()
-               ? exit_code::success
-               : exit_code::file_creation_failed;
-  }
-
-#if defined(_WIN32)
-  if (utils::cli::has_option(args, utils::cli::options::hidden_option)) {
-    ::ShowWindow(::GetConsoleWindow(), SW_HIDE);
-  }
-#endif // defined(_WIN32)
-
-  auto drive_args = utils::cli::parse_drive_options(args, prov, data_directory);
-  app_config config(prov, data_directory);
-  {
-    std::uint16_t port{};
-    if (not utils::get_next_available_port(config.get_api_port(), port)) {
-      std::cerr << "FATAL: Unable to get available port" << std::endl;
-      return exit_code::startup_exception;
-    }
-    config.set_api_port(port);
-  }
-
-#if defined(_WIN32)
-  if (config.get_enable_mount_manager() && not utils::is_process_elevated()) {
-    utils::com_init_wrapper wrapper;
-    if (not lock.set_mount_state(true, "elevating", -1)) {
-      std::cerr << "failed to set mount state" << std::endl;
-    }
-    lock.release();
-    global_lock.release();
-
-    mount_result = utils::run_process_elevated(args);
-    lock_data prov_lock(prov, unique_id);
-    if (prov_lock.grab_lock() == lock_result::success) {
-      if (not prov_lock.set_mount_state(false, "", -1)) {
-        std::cerr << "failed to set mount state" << std::endl;
-      }
-      prov_lock.release();
-    }
-
-    return exit_code::mount_result;
-  }
-#endif // defined(_WIN32)
-
-  std::cout << "Initializing " << app_config::get_provider_display_name(prov)
-            << (unique_id.empty() ? ""
-                : (prov == provider_type::remote)
-                    ? " [" + remote_host + ':' + std::to_string(remote_port) +
-                          ']'
-                    : " [" + unique_id + ']')
-            << " Drive" << std::endl;
-  if (prov == provider_type::remote) {
-    try {
-      auto remote_cfg = config.get_remote_config();
-      remote_cfg.host_name_or_ip = remote_host;
-      remote_cfg.api_port = remote_port;
-      config.set_remote_config(remote_cfg);
-
-      remote_drive drive(
-          config,
-          [&config]() -> std::unique_ptr<remote_instance> {
-            return std::unique_ptr<remote_instance>(new remote_client(config));
-          },
-          lock);
-      if (not lock.set_mount_state(true, "", -1)) {
-        std::cerr << "failed to set mount state" << std::endl;
       }
 
-      global_lock.release();
+      std::cout << "Generated " << app_config::get_provider_display_name(prov)
-      mount_result = drive.mount(drive_args);
+                << " Configuration" << std::endl;
-      return exit_code::mount_result;
+      std::cout << config.get_config_file_path() << std::endl;
-    } catch (const std::exception &e) {
+      ret = utils::file::file(config.get_config_file_path()).exists()
-      std::cerr << "FATAL: " << e.what() << std::endl;
+                ? exit_code::success
-    }
+                : exit_code::file_creation_failed;
+    } else {
+#if defined(_WIN32)
+      if (utils::cli::has_option(args, utils::cli::options::hidden_option)) {
+        ::ShowWindow(::GetConsoleWindow(), SW_HIDE);
+      }
+#endif // defined(_WIN32)
+      auto drive_args =
+          utils::cli::parse_drive_options(args, prov, data_directory);
+      app_config config(prov, data_directory);
+#if defined(_WIN32)
+      if (config.get_enable_mount_manager() &&
+          not utils::is_process_elevated()) {
+        utils::com_init_wrapper cw;
+        if (not lock.set_mount_state(true, "elevating", -1)) {
+          std::cerr << "failed to set mount state" << std::endl;
+        }
+        lock.release();
 
-    return exit_code::startup_exception;
+        mount_result = utils::run_process_elevated(args);
+        lock_data lock2(prov, unique_id);
+        if (lock2.grab_lock() == lock_result::success) {
+          if (not lock2.set_mount_state(false, "", -1)) {
+            std::cerr << "failed to set mount state" << std::endl;
+          }
+          lock2.release();
+        }
+
+        return exit_code::mount_result;
+      }
+#endif // defined(_WIN32)
+      std::cout << "Initializing "
+                << app_config::get_provider_display_name(prov)
+                << (unique_id.empty() ? ""
+                    : (prov == provider_type::remote)
+                        ? " [" + remote_host + ':' +
+                              std::to_string(remote_port) + ']'
+                        : " [" + unique_id + ']')
+                << " Drive" << std::endl;
+      if (prov == provider_type::remote) {
+        std::uint16_t port{0U};
+        if (utils::get_next_available_port(config.get_api_port(), port)) {
+          auto cfg = config.get_remote_config();
+          cfg.host_name_or_ip = remote_host;
+          cfg.api_port = remote_port;
+          config.set_remote_config(cfg);
+          config.set_api_port(port);
+
+          try {
+            remote_drive drive(
+                config,
+                [&config]() -> std::unique_ptr<remote_instance> {
+                  return std::unique_ptr<remote_instance>(
+                      new remote_client(config));
+                },
+                lock);
+            if (not lock.set_mount_state(true, "", -1)) {
+              std::cerr << "failed to set mount state" << std::endl;
+            }
+            mount_result = drive.mount(drive_args);
+            ret = exit_code::mount_result;
+          } catch (const std::exception &e) {
+            std::cerr << "FATAL: " << e.what() << std::endl;
+            ret = exit_code::startup_exception;
+          }
+        } else {
+          std::cerr << "FATAL: Unable to get available port" << std::endl;
+          ret = exit_code::startup_exception;
+        }
+      } else {
+        if (prov == provider_type::sia &&
+            config.get_sia_config().bucket.empty()) {
+          [[maybe_unused]] auto bucket =
+              config.set_value_by_name("SiaConfig.Bucket", unique_id);
+        }
+
+        try {
+          auto provider = create_provider(prov, config);
+          repertory_drive drive(config, lock, *provider);
+          if (not lock.set_mount_state(true, "", -1)) {
+            std::cerr << "failed to set mount state" << std::endl;
+          }
+          mount_result = drive.mount(drive_args);
+          ret = exit_code::mount_result;
+        } catch (const std::exception &e) {
+          std::cerr << "FATAL: " << e.what() << std::endl;
+          ret = exit_code::startup_exception;
+        }
+      }
+    }
+  } else {
+    ret = exit_code::lock_failed;
   }
 
-  try {
+  return ret;
-    if (prov == provider_type::sia && config.get_sia_config().bucket.empty()) {
-      [[maybe_unused]] auto bucket =
-          config.set_value_by_name("SiaConfig.Bucket", unique_id);
-    }
-
-    auto provider = create_provider(prov, config);
-    repertory_drive drive(config, lock, *provider);
-    if (not lock.set_mount_state(true, "", -1)) {
-      std::cerr << "failed to set mount state" << std::endl;
-    }
-
-    global_lock.release();
-    mount_result = drive.mount(drive_args);
-    return exit_code::mount_result;
-  } catch (const std::exception &e) {
-    std::cerr << "FATAL: " << e.what() << std::endl;
-  }
-
-  return exit_code::startup_exception;
 }
 } // namespace repertory::cli::actions
 

repertory/repertory/include/cli/ui.hpp

@@ -34,14 +34,13 @@ namespace repertory::cli::actions {
 ui(std::vector<const char *> args, const std::string & /*data_directory*/,
    const provider_type & /* prov */, const std::string & /* unique_id */,
    std::string /* user */, std::string /* password */) -> exit_code {
-
+  auto ui_port{default_ui_mgmt_port};
-  ui::mgmt_app_config config{};
 
   std::string data;
   auto res = utils::cli::parse_string_option(
       args, utils::cli::options::ui_port_option, data);
   if (res == exit_code::success && not data.empty()) {
-    config.set_api_port(utils::string::to_uint16(data));
+    ui_port = utils::string::to_uint16(data);
   }
 
   if (not utils::file::change_to_process_directory()) {
@@ -53,6 +52,9 @@ ui(std::vector<const char *> args, const std::string & /*data_directory*/,
     return exit_code::ui_mount_failed;
   }
 
+  ui::mgmt_app_config config{};
+  config.set_api_port(ui_port);
+
   ui::handlers handlers(&config, &server);
   return exit_code::success;
 }

repertory/repertory/include/ui/handlers.hpp

@@ -23,26 +23,11 @@
 #define REPERTORY_INCLUDE_UI_HANDLERS_HPP_
 
 #include "events/consumers/console_consumer.hpp"
-#include "utils/common.hpp"
 
 namespace repertory::ui {
 class mgmt_app_config;
 
 class handlers final {
-private:
-  static constexpr const auto nonce_length{128U};
-  static constexpr const auto nonce_timeout{15U};
-
-  struct nonce_data final {
-    std::chrono::system_clock::time_point creation{
-        std::chrono::system_clock::now(),
-    };
-
-    std::string nonce{
-        utils::generate_random_string(nonce_length),
-    };
-  };
-
 public:
   handlers(mgmt_app_config *config, httplib::Server *server);
 
@@ -62,58 +47,23 @@ private:
 
 private:
   console_consumer console;
-  mutable std::mutex mtx_;
-  mutable std::unordered_map<std::string, std::recursive_mutex> mtx_lookup_;
-  std::mutex nonce_mtx_;
-  std::unordered_map<std::string, nonce_data> nonce_lookup_;
-  std::condition_variable nonce_notify_;
-  std::unique_ptr<std::thread> nonce_thread_;
-  stop_type stop_requested{false};
 
 private:
-  [[nodiscard]] auto data_directory_exists(provider_type prov,
+  void handle_get_mount(auto &&req, auto &&res) const;
-                                           std::string_view name) const -> bool;
 
-  static void handle_get_available_locations(httplib::Response &res);
+  void handle_get_mount_list(auto &&res) const;
 
-  void handle_get_mount(const httplib::Request &req,
+  void handle_get_mount_location(auto &&req, auto &&res) const;
-                        httplib::Response &res) const;
 
-  void handle_get_mount_list(httplib::Response &res) const;
+  void handle_get_mount_status(auto &&req, auto &&res) const;
 
-  void handle_get_mount_location(const httplib::Request &req,
+  void handle_post_mount(auto &&req, auto &&res) const;
-                                 httplib::Response &res) const;
 
-  void handle_get_mount_status(const httplib::Request &req,
+  void handle_put_set_value_by_name(auto &&req, auto &&res);
-                               httplib::Response &res) const;
-
-  void handle_get_nonce(httplib::Response &res);
-
-  void handle_get_settings(httplib::Response &res) const;
-
-  void handle_post_add_mount(const httplib::Request &req,
-                             httplib::Response &res) const;
-
-  void handle_post_mount(const httplib::Request &req, httplib::Response &res);
-
-  void handle_put_mount_location(const httplib::Request &req,
-                                 httplib::Response &res) const;
-
-  void handle_put_set_value_by_name(const httplib::Request &req,
-                                    httplib::Response &res) const;
-
-  void handle_put_settings(const httplib::Request &req,
-                           httplib::Response &res) const;
 
   auto launch_process(provider_type prov, std::string_view name,
-                      std::vector<std::string> args,
+                      std::string_view args, bool background = false) const
-                      bool background = false) const
       -> std::vector<std::string>;
-
-  void removed_expired_nonces();
-
-  void set_key_value(provider_type prov, std::string_view name,
-                     std::string_view key, std::string_view value) const;
 };
 } // namespace repertory::ui
 

repertory/repertory/include/ui/mgmt_app_config.hpp

@@ -30,9 +30,9 @@ public:
   mgmt_app_config();
 
 private:
-  atomic<std::string> api_password_{"repertory"};
+  atomic<std::string> api_auth_{"test"};
   std::atomic<std::uint16_t> api_port_{default_ui_mgmt_port};
-  atomic<std::string> api_user_{"repertory"};
+  atomic<std::string> api_user_{"test"};
   std::unordered_map<provider_type,
                      std::unordered_map<std::string, std::string>>
       locations_;
@@ -42,11 +42,7 @@ private:
   void save() const;
 
 public:
-  [[nodiscard]] auto to_json() const -> nlohmann::json;
+  [[nodiscard]] auto get_api_auth() const -> std::string { return api_auth_; }
-
-  [[nodiscard]] auto get_api_password() const -> std::string {
-    return api_password_;
-  }
 
   [[nodiscard]] auto get_api_port() const -> std::uint16_t { return api_port_; }
 
@@ -56,12 +52,8 @@ public:
                                         std::string_view name) const
       -> std::string;
 
-  void set_api_password(std::string_view api_password);
-
   void set_api_port(std::uint16_t api_port);
 
-  void set_api_user(std::string_view api_user);
-
   void set_mount_location(provider_type prov, std::string_view name,
                           std::string_view location);
 };

repertory/repertory/src/ui/handlers.cpp

@@ -23,78 +23,18 @@
 
 #include "app_config.hpp"
 #include "events/event_system.hpp"
+#include "rpc/common.hpp"
 #include "types/repertory.hpp"
 #include "ui/mgmt_app_config.hpp"
-#include "utils/collection.hpp"
-#include "utils/common.hpp"
-#include "utils/config.hpp"
 #include "utils/error_utils.hpp"
 #include "utils/file.hpp"
-#include "utils/hash.hpp"
 #include "utils/path.hpp"
 #include "utils/string.hpp"
 
-#include <boost/process.hpp>
-
 namespace {
-[[nodiscard]] auto decrypt(std::string_view data, std::string_view password)
+[[nodiscard]] constexpr auto is_restricted(std::string_view data) -> bool {
-    -> std::string {
+  constexpr std::string_view invalid_chars = "&;|><$()`{}!*?";
-  REPERTORY_USES_FUNCTION_NAME();
+  return data.find_first_of(invalid_chars) != std::string_view::npos;
-  if (data.empty()) {
-    return std::string{data};
-  }
-
-  repertory::data_buffer decoded;
-  if (not repertory::utils::collection::from_hex_string(data, decoded)) {
-    throw repertory::utils::error::create_exception(function_name,
-                                                    {"decryption failed"});
-  }
-  repertory::data_buffer buffer(decoded.size());
-
-  auto key = repertory::utils::encryption::create_hash_blake2b_256(password);
-
-  unsigned long long size{};
-  auto res = crypto_aead_xchacha20poly1305_ietf_decrypt(
-      reinterpret_cast<unsigned char *>(buffer.data()), &size, nullptr,
-      reinterpret_cast<const unsigned char *>(
-          &decoded.at(crypto_aead_xchacha20poly1305_IETF_NPUBBYTES)),
-      decoded.size() - crypto_aead_xchacha20poly1305_IETF_NPUBBYTES,
-      reinterpret_cast<const unsigned char *>(REPERTORY.data()),
-      REPERTORY.length(),
-      reinterpret_cast<const unsigned char *>(decoded.data()),
-      reinterpret_cast<const unsigned char *>(key.data()));
-  if (res != 0) {
-    throw repertory::utils::error::create_exception(function_name,
-                                                    {"decryption failed"});
-  }
-
-  return {
-      buffer.begin(),
-      std::next(buffer.begin(), static_cast<std::int64_t>(size)),
-  };
-}
-
-[[nodiscard]] auto decrypt_value(const repertory::ui::mgmt_app_config *config,
-                                 std::string_view key, std::string_view value,
-                                 bool &skip) -> std::string {
-  auto last_key{key};
-  auto parts = repertory::utils::string::split(key, '.', false);
-  if (parts.size() > 1U) {
-    last_key = parts.at(parts.size() - 1U);
-  }
-
-  if (last_key == repertory::JSON_API_PASSWORD ||
-      last_key == repertory::JSON_ENCRYPTION_TOKEN ||
-      last_key == repertory::JSON_SECRET_KEY) {
-    auto decrypted = decrypt(value, config->get_api_password());
-    if (decrypted.empty()) {
-      skip = true;
-    }
-
-    return decrypted;
-  }
-
-  return std::string{value};
 }
 } // namespace
 
@@ -109,40 +49,16 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
       server_(server) {
   REPERTORY_USES_FUNCTION_NAME();
 
-  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_->set_pre_routing_handler(
-      [this](const httplib::Request &req,
+      [this](auto &&req, auto &&res) -> httplib::Server::HandlerResponse {
-             auto &&res) -> httplib::Server::HandlerResponse {
+        if (rpc::check_authorization(*config_, req)) {
-        if (req.path == "/api/v1/nonce" || req.path == "/ui" ||
-            req.path.starts_with("/ui/")) {
           return httplib::Server::HandlerResponse::Unhandled;
         }
 
-        auto auth =
-            decrypt(req.get_param_value("auth"), config_->get_api_password());
-        if (utils::string::begins_with(
-                auth, fmt::format("{}_", config_->get_api_user()))) {
-          auto nonce = auth.substr(config_->get_api_user().length() + 1U);
-
-          mutex_lock lock(nonce_mtx_);
-          if (nonce_lookup_.contains(nonce)) {
-            nonce_lookup_.erase(nonce);
-            return httplib::Server::HandlerResponse::Unhandled;
-          }
-        }
-
         res.status = http_error_codes::unauthorized;
+        res.set_header(
+            "WWW-Authenticate",
+            R"(Basic realm="Repertory Management Portal", charset="UTF-8")");
         return httplib::Server::HandlerResponse::Handled;
       });
 
@@ -166,14 +82,7 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
     }
 
     res.set_content(data.dump(), "application/json");
-    res.status = utils::string::ends_with(data["error"].get<std::string>(),
+    res.status = http_error_codes::internal_error;
-                                          "|decryption failed")
-                     ? http_error_codes::unauthorized
-                     : http_error_codes::internal_error;
-  });
-
-  server->Get("/api/v1/locations", [](auto && /* req */, auto &&res) {
-    handle_get_available_locations(res);
   });
 
   server->Get("/api/v1/mount",
@@ -187,35 +96,19 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
     handle_get_mount_list(res);
   });
 
-  server->Get("/api/v1/mount_status", [this](auto &&req, auto &&res) {
+  server->Get("/api/v1/mount_status",
-    handle_get_mount_status(req, res);
+              [this](const httplib::Request &req, auto &&res) {
-  });
+                handle_get_mount_status(req, res);
-
+              });
-  server->Get("/api/v1/nonce",
-              [this](auto && /* req */, auto &&res) { handle_get_nonce(res); });
-
-  server->Get("/api/v1/settings", [this](auto && /* req */, auto &&res) {
-    handle_get_settings(res);
-  });
-
-  server->Post("/api/v1/add_mount", [this](auto &&req, auto &&res) {
-    handle_post_add_mount(req, res);
-  });
 
   server->Post("/api/v1/mount",
                [this](auto &&req, auto &&res) { handle_post_mount(req, res); });
 
-  server->Put("/api/v1/mount_location", [this](auto &&req, auto &&res) {
-    handle_put_mount_location(req, res);
-  });
-
   server->Put("/api/v1/set_value_by_name", [this](auto &&req, auto &&res) {
     handle_put_set_value_by_name(req, res);
   });
 
-  server->Put("/api/v1/settings", [this](auto &&req, auto &&res) {
+  event_system::instance().start();
-    handle_put_settings(req, res);
-  });
 
   static std::atomic<httplib::Server *> this_server{server_};
   static const auto quit_handler = [](int /* sig */) {
@@ -247,124 +140,18 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
   build fails here
 #endif
 
-  std::uint16_t port{};
-  if (not utils::get_next_available_port(config_->get_api_port(), port)) {
-    fmt::println("failed to detect if port is available|{}",
-                 config_->get_api_port());
-    return;
-  }
-
-  if (port != config_->get_api_port()) {
-    fmt::println("failed to listen on port|{}|next available|{}",
-                 config_->get_api_port(), port);
-    return;
-  }
-
-  event_system::instance().start();
-
-  nonce_thread_ =
-      std::make_unique<std::thread>([this]() { removed_expired_nonces(); });
-
   server_->listen("127.0.0.1", config_->get_api_port());
-  if (this_server != nullptr) {
+  this_server = nullptr;
-    this_server = nullptr;
-    server_->stop();
-  }
 }
 
-handlers::~handlers() {
+handlers::~handlers() { event_system::instance().stop(); }
-  if (nonce_thread_) {
-    stop_requested = true;
 
-    unique_mutex_lock lock(nonce_mtx_);
+void handlers::handle_get_mount(auto &&req, auto &&res) const {
-    nonce_notify_.notify_all();
-    lock.unlock();
-
-    nonce_thread_->join();
-    nonce_thread_.reset();
-  }
-
-  event_system::instance().stop();
-}
-
-auto handlers::data_directory_exists(provider_type prov,
-                                     std::string_view name) const -> bool {
-  auto data_dir = utils::path::combine(app_config::get_root_data_directory(),
-                                       {
-                                           app_config::get_provider_name(prov),
-                                           name,
-                                       });
-  auto ret = utils::file::directory{data_dir}.exists();
-  if (ret) {
-    return ret;
-  }
-
-  unique_mutex_lock lock(mtx_);
-  mtx_lookup_.erase(
-      fmt::format("{}-{}", name, app_config::get_provider_name(prov)));
-  lock.unlock();
-  return ret;
-}
-
-void handlers::handle_put_mount_location(const httplib::Request &req,
-                                         httplib::Response &res) const {
   REPERTORY_USES_FUNCTION_NAME();
 
   auto prov = provider_type_from_string(req.get_param_value("type"));
-  auto name = req.get_param_value("name");
-  auto location = req.get_param_value("location");
 
-  if (not data_directory_exists(prov, name)) {
+  auto lines = launch_process(prov, req.get_param_value("name"), "-dc");
-    res.status = http_error_codes::not_found;
-    return;
-  }
-
-  config_->set_mount_location(prov, name, location);
-  res.status = http_error_codes::ok;
-}
-
-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:",
-  };
-
-  auto available = std::accumulate(
-      letters.begin(), letters.end(), std::vector<std::string_view>(),
-      [](auto &&vec, auto &&letter) -> std::vector<std::string_view> {
-        if (utils::file::directory{utils::path::combine(letter, {"\\"})}
-                .exists()) {
-          return vec;
-        }
-
-        vec.emplace_back(letter);
-        return vec;
-      });
-
-  res.set_content(nlohmann::json(available).dump(), "application/json");
-#else  // !defined(_WIN32)
-  res.set_content(nlohmann::json(std::vector<std::string_view>()).dump(),
-                  "application/json");
-#endif // defined(_WIN32)
-
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_get_mount(const httplib::Request &req,
-                                httplib::Response &res) const {
-  REPERTORY_USES_FUNCTION_NAME();
-
-  auto prov = provider_type_from_string(req.get_param_value("type"));
-  auto name = req.get_param_value("name");
-
-  if (not data_directory_exists(prov, name)) {
-    res.status = http_error_codes::not_found;
-    return;
-  }
-
-  auto lines = launch_process(prov, name, {"-dc"});
 
   if (lines.at(0U) != "0") {
     throw utils::error::create_exception(function_name, {
@@ -376,13 +163,11 @@ void handlers::handle_get_mount(const httplib::Request &req,
   lines.erase(lines.begin());
 
   auto result = nlohmann::json::parse(utils::string::join(lines, '\n'));
-  clean_json_config(prov, result);
-
   res.set_content(result.dump(), "application/json");
   res.status = http_error_codes::ok;
 }
 
-void handlers::handle_get_mount_list(httplib::Response &res) const {
+void handlers::handle_get_mount_list(auto &&res) const {
   auto data_dir = utils::file::directory{app_config::get_root_data_directory()};
 
   nlohmann::json result;
@@ -411,16 +196,10 @@ void handlers::handle_get_mount_list(httplib::Response &res) const {
   res.status = http_error_codes::ok;
 }
 
-void handlers::handle_get_mount_location(const httplib::Request &req,
+void handlers::handle_get_mount_location(auto &&req, auto &&res) const {
-                                         httplib::Response &res) const {
   auto name = req.get_param_value("name");
   auto prov = provider_type_from_string(req.get_param_value("type"));
 
-  if (not data_directory_exists(prov, name)) {
-    res.status = http_error_codes::not_found;
-    return;
-  }
-
   res.set_content(
       nlohmann::json({
                          {"Location", config_->get_mount_location(prov, name)},
@@ -430,207 +209,24 @@ void handlers::handle_get_mount_location(const httplib::Request &req,
   res.status = http_error_codes::ok;
 }
 
-void handlers::handle_get_mount_status(const httplib::Request &req,
+void handlers::handle_get_mount_status(auto &&req, auto &&res) const {
-                                       httplib::Response &res) const {
-  auto name = req.get_param_value("name");
-  auto prov = provider_type_from_string(req.get_param_value("type"));
-
-  if (not data_directory_exists(prov, name)) {
-    res.status = http_error_codes::not_found;
-    return;
-  }
-
-  auto lines = launch_process(prov, name, {"-status"});
-
-  auto result = nlohmann::json::parse(utils::string::join(lines, '\n'));
-  if (result.at("Location").get<std::string>().empty()) {
-    result.at("Location") = config_->get_mount_location(prov, name);
-  } else if (result.at("Active").get<bool>()) {
-    config_->set_mount_location(prov, name,
-                                result.at("Location").get<std::string>());
-  }
-
-  res.set_content(result.dump(), "application/json");
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_get_nonce(httplib::Response &res) {
-  mutex_lock lock(nonce_mtx_);
-
-  nonce_data nonce{};
-  nonce_lookup_[nonce.nonce] = nonce;
-
-  nlohmann::json data({{"nonce", nonce.nonce}});
-  res.set_content(data.dump(), "application/json");
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_get_settings(httplib::Response &res) const {
-  auto settings = config_->to_json();
-  settings[JSON_API_PASSWORD] = "";
-  settings.erase(JSON_MOUNT_LOCATIONS);
-  res.set_content(settings.dump(), "application/json");
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_post_add_mount(const httplib::Request &req,
-                                     httplib::Response &res) const {
-  auto name = req.get_param_value("name");
-  auto prov = provider_type_from_string(req.get_param_value("type"));
-  if (data_directory_exists(prov, name)) {
-    res.status = http_error_codes::ok;
-    return;
-  }
-
-  auto cfg = nlohmann::json::parse(req.get_param_value("config"));
-
-  std::map<std::string, std::string> values{};
-  for (const auto &[key, value] : cfg.items()) {
-    if (value.is_object()) {
-      for (const auto &[key2, value2] : value.items()) {
-        auto sub_key = fmt::format("{}.{}", key, key2);
-        auto skip{false};
-        auto decrypted = decrypt_value(
-            config_, sub_key, value2.template get<std::string>(), skip);
-        if (skip) {
-          continue;
-        }
-        values[sub_key] = decrypted;
-      }
-
-      continue;
-    }
-
-    auto skip{false};
-    auto decrypted =
-        decrypt_value(config_, key, value.template get<std::string>(), skip);
-    if (skip) {
-      continue;
-    }
-    values[key] = decrypted;
-  }
-
-  launch_process(prov, name, {"-gc"});
-  for (auto &[key, value] : values) {
-    set_key_value(prov, name, key, value);
-  }
-
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_post_mount(const httplib::Request &req,
-                                 httplib::Response &res) {
-  auto name = req.get_param_value("name");
-  auto prov = provider_type_from_string(req.get_param_value("type"));
-
-  if (not data_directory_exists(prov, name)) {
-    res.status = http_error_codes::not_found;
-    return;
-  }
-
-  auto location = utils::path::absolute(req.get_param_value("location"));
-  auto unmount = utils::string::to_bool(req.get_param_value("unmount"));
-
-  if (unmount) {
-    launch_process(prov, name, {"-unmount"});
-  } else {
-#if defined(_WIN32)
-    if (utils::file::directory{location}.exists()) {
-#else  // !defined(_WIN32)
-    if (not utils::file::directory{location}.exists()) {
-#endif // defined(_WIN32)
-      config_->set_mount_location(prov, name, "");
-      res.status = http_error_codes::internal_error;
-      return;
-    }
-
-    config_->set_mount_location(prov, name, location);
-
-    static std::mutex mount_mtx;
-    mutex_lock lock(mount_mtx);
-
-    launch_process(prov, name, {location}, true);
-    launch_process(prov, name, {"-status"});
-  }
-
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_put_set_value_by_name(const httplib::Request &req,
-                                            httplib::Response &res) const {
-  auto name = req.get_param_value("name");
-  auto prov = provider_type_from_string(req.get_param_value("type"));
-
-  if (not data_directory_exists(prov, name)) {
-    res.status = http_error_codes::not_found;
-    return;
-  }
-
-  auto key = req.get_param_value("key");
-  auto value = req.get_param_value("value");
-
-  auto skip{false};
-  value = decrypt_value(config_, key, value, skip);
-  if (not skip) {
-    set_key_value(prov, name, key, value);
-  }
-
-  res.status = http_error_codes::ok;
-}
-
-void handlers::handle_put_settings(const httplib::Request &req,
-                                   httplib::Response &res) const {
-  auto data = nlohmann::json::parse(req.get_param_value("data"));
-
-  if (data.contains(JSON_API_PASSWORD)) {
-    auto password = decrypt(data.at(JSON_API_PASSWORD).get<std::string>(),
-                            config_->get_api_password());
-    if (not password.empty()) {
-      config_->set_api_password(password);
-    }
-  }
-
-  if (data.contains(JSON_API_PORT)) {
-    config_->set_api_port(
-        utils::string::to_uint16(data.at(JSON_API_PORT).get<std::string>()));
-  }
-
-  if (data.contains(JSON_API_USER)) {
-    config_->set_api_user(data.at(JSON_API_USER).get<std::string>());
-  }
-
-  res.status = http_error_codes::ok;
-}
-
-auto handlers::launch_process(provider_type prov, std::string_view name,
-                              std::vector<std::string> args,
-                              bool background) const
-    -> std::vector<std::string> {
   REPERTORY_USES_FUNCTION_NAME();
 
-  switch (prov) {
+  auto name = req.get_param_value("name");
-  case provider_type::encrypt:
+  auto prov = provider_type_from_string(req.get_param_value("type"));
-    args.insert(args.begin(), "-en");
-    args.insert(std::next(args.begin()), "-na");
-    args.insert(std::next(args.begin(), 2U), std::string{name});
-    break;
 
+  auto status_name = app_config::get_provider_display_name(prov);
+
+  switch (prov) {
   case provider_type::remote: {
     auto parts = utils::string::split(name, '_', false);
-    args.insert(args.begin(), "-rm");
+    status_name = fmt::format("{}{}:{}", status_name, parts[0U], parts[1U]);
-    args.insert(std::next(args.begin()),
-                fmt::format("{}:{}", parts.at(0U), parts.at(1U)));
   } break;
 
-  case provider_type::s3:
+  case provider_type::encrypt:
-    args.insert(args.begin(), "-s3");
-    args.insert(std::next(args.begin()), "-na");
-    args.insert(std::next(args.begin(), 2U), std::string{name});
-    break;
-
   case provider_type::sia:
-    args.insert(args.begin(), "-na");
+  case provider_type::s3:
-    args.insert(std::next(args.begin()), std::string{name});
+    status_name = fmt::format("{}{}", status_name, name);
     break;
 
   default:
@@ -642,110 +238,124 @@ auto handlers::launch_process(provider_type prov, std::string_view name,
                                          });
   }
 
-  unique_mutex_lock lock(mtx_);
+  auto lines = launch_process(prov, name, "-status");
-  auto &inst_mtx = mtx_lookup_[fmt::format(
+
-      "{}-{}", name, app_config::get_provider_name(prov))];
+  nlohmann::json result(
-  lock.unlock();
+      nlohmann::json::parse(utils::string::join(lines, '\n')).at(status_name));
+  if (result.at("Location").get<std::string>().empty()) {
+    result.at("Location") = config_->get_mount_location(prov, name);
+  } else if (result.at("Active").get<bool>()) {
+    config_->set_mount_location(prov, name,
+                                result.at("Location").get<std::string>());
+  }
+
+  res.set_content(result.dump(), "application/json");
+  res.status = http_error_codes::ok;
+}
+
+void handlers::handle_post_mount(auto &&req, auto &&res) const {
+  auto location = utils::path::absolute(req.get_param_value("location"));
+  auto name = req.get_param_value("name");
+  auto prov = provider_type_from_string(req.get_param_value("type"));
+  auto unmount = utils::string::to_bool(req.get_param_value("unmount"));
+
+  if (unmount) {
+    launch_process(prov, name, "-unmount");
+  } else {
+    launch_process(prov, name, fmt::format(R"("{}")", location), true);
+  }
+
+  res.status = http_error_codes::ok;
+}
+
+void handlers::handle_put_set_value_by_name(auto &&req, auto &&res) {
+  auto key = req.get_param_value("key");
+  auto name = req.get_param_value("name");
+  auto prov = provider_type_from_string(req.get_param_value("type"));
+  auto value = req.get_param_value("value");
+
+#if defined(_WIN32)
+  launch_process(prov, name, fmt::format(R"(-set {} "{}")", key, value));
+#else  //! defined(_WIN32)
+  launch_process(prov, name, fmt::format("-set {} '{}'", key, value));
+#endif // defined(_WIN32)
+
+  res.status = http_error_codes::ok;
+}
+
+auto handlers::launch_process(provider_type prov, std::string_view name,
+                              std::string_view args, bool background) const
+    -> std::vector<std::string> {
+  REPERTORY_USES_FUNCTION_NAME();
+
+  if (is_restricted(name) || is_restricted(args)) {
+    throw utils::error::create_exception(function_name,
+                                         {
+                                             "invalid data detected",
+                                         });
+  }
+
+  std::string str_type;
+  switch (prov) {
+  case provider_type::encrypt:
+    str_type = fmt::format("-en -na {}", name);
+    break;
+
+  case provider_type::remote: {
+    auto parts = utils::string::split(name, '_', false);
+    str_type = fmt::format("-rm {}:{}", parts[0U], parts[1U]);
+  } break;
+
+  case provider_type::s3:
+    str_type = fmt::format("-s3 -na {}", name);
+    break;
+
+  case provider_type::sia:
+    str_type = fmt::format("-na {}", name);
+    break;
+
+  default:
+    throw utils::error::create_exception(function_name,
+                                         {
+                                             "provider is not supported",
+                                             provider_type_to_string(prov),
+                                             name,
+                                         });
+  }
+
+  auto cmd_line = fmt::format(R"({} {} {})", repertory_binary_, str_type, args);
 
-  recur_mutex_lock inst_lock(inst_mtx);
   if (background) {
 #if defined(_WIN32)
-    std::array<char, MAX_PATH + 1U> path{};
+    system(fmt::format(R"(start "" /b {})", cmd_line).c_str());
-    ::GetSystemDirectoryA(path.data(), path.size());
+#elif defined(__linux__) // defined(__linux__)
-
+    system(fmt::format("nohup {} 1>/dev/null 2>&1", cmd_line).c_str());
-    args.insert(args.begin(), utils::path::combine(path.data(), {"cmd.exe"}));
+#else                    // !defined(__linux__) && !defined(_WIN32)
-    args.insert(std::next(args.begin()), "/c");
+    build fails here
-    args.insert(std::next(args.begin(), 2U), "start");
+#endif                   // defined(_WIN32)
-    args.insert(std::next(args.begin(), 3U), "");
-    args.insert(std::next(args.begin(), 4U), "/MIN");
-    args.insert(std::next(args.begin(), 5U), repertory_binary_);
-#else  // !defined(_WIN32)
-    args.insert(args.begin(), repertory_binary_);
-#endif // defined(_WIN32)
-
-    std::vector<const char *> exec_args;
-    exec_args.reserve(args.size() + 1U);
-    for (const auto &arg : args) {
-      exec_args.push_back(arg.c_str());
-    }
-    exec_args.push_back(nullptr);
-
-#if defined(_WIN32)
-    _spawnv(_P_DETACH, exec_args.at(0U),
-            const_cast<char *const *>(exec_args.data()));
-#else  // !defined(_WIN32)
-    auto pid = fork();
-    if (pid == 0) {
-      setsid();
-      chdir("/");
-      close(STDIN_FILENO);
-      close(STDOUT_FILENO);
-      close(STDERR_FILENO);
-      open("/dev/null", O_RDONLY);
-      open("/dev/null", O_WRONLY);
-      open("/dev/null", O_WRONLY);
-
-      execvp(exec_args.at(0U), const_cast<char *const *>(exec_args.data()));
-    } else {
-      signal(SIGCHLD, SIG_IGN);
-    }
-#endif // defined(_WIN32)
     return {};
   }
 
-  boost::process::ipstream out;
+  auto *pipe = popen(cmd_line.c_str(), "r");
-  boost::process::child proc(repertory_binary_, boost::process::args(args),
+  if (pipe == nullptr) {
-                             boost::process::std_out > out);
+    throw utils::error::create_exception(function_name,
+                                         {
+                                             "failed to execute command",
+                                             provider_type_to_string(prov),
+                                             name,
+                                         });
+  }
 
   std::string data;
-  std::string line;
+  std::array<char, 1024U> buffer{};
-  while (out && std::getline(out, line)) {
+  while (feof(pipe) == 0) {
-    data += line + "\n";
+    while (fgets(buffer.data(), buffer.size(), pipe) != nullptr) {
+      data += buffer.data();
+    }
   }
+  pclose(pipe);
 
   return utils::string::split(utils::string::replace(data, "\r", ""), '\n',
                               false);
 }
-
-void handlers::removed_expired_nonces() {
-  unique_mutex_lock lock(nonce_mtx_);
-  lock.unlock();
-
-  while (not stop_requested) {
-    lock.lock();
-    auto nonces = nonce_lookup_;
-    lock.unlock();
-
-    for (const auto &[key, value] : nonces) {
-      if (std::chrono::duration_cast<std::chrono::seconds>(
-              std::chrono::system_clock::now() - value.creation)
-              .count() >= nonce_timeout) {
-        lock.lock();
-        nonce_lookup_.erase(key);
-        lock.unlock();
-      }
-    }
-
-    if (stop_requested) {
-      break;
-    }
-
-    lock.lock();
-    if (stop_requested) {
-      break;
-    }
-    nonce_notify_.wait_for(lock, std::chrono::seconds(1U));
-    lock.unlock();
-  }
-}
-
-void handlers::set_key_value(provider_type prov, std::string_view name,
-                             std::string_view key,
-                             std::string_view value) const {
-  std::vector<std::string> args;
-  args.emplace_back("-set");
-  args.emplace_back(key);
-  args.emplace_back(value);
-  launch_process(prov, name, args, false);
-}
 } // namespace repertory::ui

repertory/repertory/src/ui/mgmt_app_config.cpp

@@ -45,21 +45,21 @@ namespace {
     return map_of_maps;
   }
 
-  for (auto &[prov, map] : map_of_maps) {
+  for (const auto &[prov, map] : map_of_maps) {
-    auto prov_str = repertory::provider_type_to_string(prov);
+    for (const auto &[key, value] :
-    if (!json.contains(prov_str)) {
+         json[repertory::provider_type_to_string(prov)].items()) {
-      continue;
+      if (value.is_null()) {
-    }
+        continue;
+      }
 
-    for (const auto &[key, value] : json.at(prov_str).items()) {
+      map_of_maps[prov][key] = value;
-      map[key] = value;
     }
   }
 
   return map_of_maps;
 }
 
-[[nodiscard]] auto map_to_json(const auto &map_of_maps) -> nlohmann::json {
+[[nodiscard]] auto to_json(const auto &map_of_maps) -> nlohmann::json {
   auto json = nlohmann::json::object();
   for (const auto &[prov, map] : map_of_maps) {
     for (const auto &[key, value] : map) {
@@ -90,7 +90,7 @@ mgmt_app_config::mgmt_app_config() {
 
     nlohmann::json data;
     if (utils::file::read_json_file(config_file, data)) {
-      api_password_ = data.at(JSON_API_PASSWORD).get<std::string>();
+      api_auth_ = data.at(JSON_API_PASSWORD).get<std::string>();
       api_port_ = data.at(JSON_API_PORT).get<std::uint16_t>();
       api_user_ = data.at(JSON_API_USER).get<std::string>();
       locations_ = from_json(data.at(JSON_MOUNT_LOCATIONS));
@@ -134,7 +134,12 @@ void mgmt_app_config::save() const {
       return;
     }
 
-    if (utils::file::write_json_file(config_file, to_json())) {
+    nlohmann::json data;
+    data[JSON_API_PASSWORD] = api_auth_;
+    data[JSON_API_PORT] = api_port_;
+    data[JSON_API_USER] = api_user_;
+    data[JSON_MOUNT_LOCATIONS] = to_json(locations_);
+    if (utils::file::write_json_file(config_file, data)) {
       return;
     }
 
@@ -147,15 +152,6 @@ void mgmt_app_config::save() const {
   }
 }
 
-void mgmt_app_config::set_api_password(std::string_view api_password) {
-  if (api_password_ == std::string{api_password}) {
-    return;
-  }
-
-  api_password_ = std::string{api_password};
-  save();
-}
-
 void mgmt_app_config::set_api_port(std::uint16_t api_port) {
   if (api_port_ == api_port) {
     return;
@@ -165,15 +161,6 @@ void mgmt_app_config::set_api_port(std::uint16_t api_port) {
   save();
 }
 
-void mgmt_app_config::set_api_user(std::string_view api_user) {
-  if (api_user_ == std::string{api_user}) {
-    return;
-  }
-
-  api_user_ = std::string{api_user};
-  save();
-}
-
 void mgmt_app_config::set_mount_location(provider_type prov,
                                          std::string_view name,
                                          std::string_view location) {
@@ -181,6 +168,10 @@ void mgmt_app_config::set_mount_location(provider_type prov,
     return;
   }
 
+  if (location.empty()) {
+    return;
+  }
+
   recur_mutex_lock lock(mtx_);
   if (locations_[prov][std::string{name}] == std::string{location}) {
     return;
@@ -190,13 +181,4 @@ void mgmt_app_config::set_mount_location(provider_type prov,
 
   save();
 }
-
-auto mgmt_app_config::to_json() const -> nlohmann::json {
-  nlohmann::json data;
-  data[JSON_API_PASSWORD] = api_password_;
-  data[JSON_API_PORT] = api_port_;
-  data[JSON_API_USER] = api_user_;
-  data[JSON_MOUNT_LOCATIONS] = map_to_json(locations_);
-  return data;
-}
 } // namespace repertory::ui

repertory/repertory_test/src/app_config_test.cpp

@@ -128,7 +128,7 @@ std::atomic<std::uint64_t> app_config_test::idx{0U};
 
 static void defaults_tests(const json &json_data, provider_type prov) {
   json json_defaults = {
-      {JSON_API_PORT, app_config::default_rpc_port()},
+      {JSON_API_PORT, app_config::default_rpc_port(prov)},
       {JSON_API_USER, std::string{REPERTORY}},
       {JSON_DOWNLOAD_TIMEOUT_SECS, default_download_timeout_secs},
       {JSON_DATABASE_TYPE, database_type::rocksdb},
@@ -185,9 +185,9 @@ static void defaults_tests(const json &json_data, provider_type prov) {
   }
 
   fmt::println("testing default|{}-{}", app_config::get_provider_name(prov),
-               JSON_API_PASSWORD);
+               JSON_API_AUTH);
-  ASSERT_EQ(std::size_t(default_api_password_size),
+  ASSERT_EQ(std::size_t(default_api_auth_size),
-            json_data.at(JSON_API_PASSWORD).get<std::string>().size());
+            json_data.at(JSON_API_AUTH).get<std::string>().size());
   for (const auto &[key, value] : json_defaults.items()) {
     fmt::println("testing default|{}-{}", app_config::get_provider_name(prov),
                  key);
@@ -216,11 +216,11 @@ static void common_tests(app_config &config, provider_type prov) {
   ASSERT_EQ(config.get_provider_type(), prov);
 
   std::map<std::string_view, std::function<void(app_config &)>> methods{
-      {JSON_API_PASSWORD,
+      {JSON_API_AUTH,
        [](app_config &cfg) {
-         test_getter_setter(cfg, &app_config::get_api_password,
+         test_getter_setter(cfg, &app_config::get_api_auth,
-                            &app_config::set_api_password, "", "auth",
+                            &app_config::set_api_auth, "", "auth",
-                            JSON_API_PASSWORD, "auth2");
+                            JSON_API_AUTH, "auth2");
        }},
       {JSON_API_PORT,
        [](app_config &cfg) {

repertory/repertory_test/src/clean_json_test.cpp

@@ -1,198 +0,0 @@
-/*
-  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 "test_common.hpp"
-
-#include "app_config.hpp"
-#include "types/repertory.hpp"
-
-namespace repertory {
-TEST(clean_json_test, can_clean_values) {
-  auto result = clean_json_value(JSON_API_PASSWORD, "moose");
-  EXPECT_TRUE(result.empty());
-
-  result = clean_json_value(
-      fmt::format("{}.{}", JSON_ENCRYPT_CONFIG, JSON_ENCRYPTION_TOKEN),
-      "moose");
-  EXPECT_TRUE(result.empty());
-
-  result = clean_json_value(
-      fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_API_PASSWORD), "moose");
-  EXPECT_TRUE(result.empty());
-
-  result = clean_json_value(
-      fmt::format("{}.{}", JSON_REMOTE_CONFIG, JSON_ENCRYPTION_TOKEN), "moose");
-  EXPECT_TRUE(result.empty());
-
-  result = clean_json_value(
-      fmt::format("{}.{}", JSON_REMOTE_MOUNT, JSON_ENCRYPTION_TOKEN), "moose");
-  EXPECT_TRUE(result.empty());
-
-  result = clean_json_value(
-      fmt::format("{}.{}", JSON_S3_CONFIG, JSON_ENCRYPTION_TOKEN), "moose");
-  EXPECT_TRUE(result.empty());
-
-  result = clean_json_value(
-      fmt::format("{}.{}", JSON_S3_CONFIG, JSON_SECRET_KEY), "moose");
-  EXPECT_TRUE(result.empty());
-}
-
-TEST(clean_json_test, can_clean_encrypt_config) {
-  auto dir =
-      utils::path::combine(test::get_test_output_dir(), {
-                                                            "clean_json_test",
-                                                            "encrypt",
-                                                        });
-  app_config cfg(provider_type::encrypt, dir);
-  cfg.set_value_by_name(JSON_API_PASSWORD, "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_ENCRYPT_CONFIG, JSON_ENCRYPTION_TOKEN),
-      "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_REMOTE_MOUNT, JSON_ENCRYPTION_TOKEN), "moose");
-
-  auto data = cfg.get_json();
-  EXPECT_FALSE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_FALSE(data.at(JSON_ENCRYPT_CONFIG)
-                   .at(JSON_ENCRYPTION_TOKEN)
-                   .get<std::string>()
-                   .empty());
-  EXPECT_FALSE(data.at(JSON_REMOTE_MOUNT)
-                   .at(JSON_ENCRYPTION_TOKEN)
-                   .get<std::string>()
-                   .empty());
-
-  clean_json_config(cfg.get_provider_type(), data);
-  EXPECT_TRUE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_TRUE(data.at(JSON_ENCRYPT_CONFIG)
-                  .at(JSON_ENCRYPTION_TOKEN)
-                  .get<std::string>()
-                  .empty());
-  EXPECT_TRUE(data.at(JSON_REMOTE_MOUNT)
-                  .at(JSON_ENCRYPTION_TOKEN)
-                  .get<std::string>()
-                  .empty());
-}
-
-TEST(clean_json_test, can_clean_remote_config) {
-  auto dir =
-      utils::path::combine(test::get_test_output_dir(), {
-                                                            "clean_json_test",
-                                                            "remote",
-                                                        });
-  app_config cfg(provider_type::remote, dir);
-  cfg.set_value_by_name(JSON_API_PASSWORD, "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_REMOTE_CONFIG, JSON_ENCRYPTION_TOKEN), "moose");
-
-  auto data = cfg.get_json();
-  EXPECT_FALSE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_FALSE(data.at(JSON_REMOTE_CONFIG)
-                   .at(JSON_ENCRYPTION_TOKEN)
-                   .get<std::string>()
-                   .empty());
-
-  clean_json_config(cfg.get_provider_type(), data);
-  EXPECT_TRUE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_TRUE(data.at(JSON_REMOTE_CONFIG)
-                  .at(JSON_ENCRYPTION_TOKEN)
-                  .get<std::string>()
-                  .empty());
-}
-
-TEST(clean_json_test, can_clean_s3_config) {
-  auto dir =
-      utils::path::combine(test::get_test_output_dir(), {
-                                                            "clean_json_test",
-                                                            "s3",
-                                                        });
-  app_config cfg(provider_type::s3, dir);
-  cfg.set_value_by_name(JSON_API_PASSWORD, "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_REMOTE_MOUNT, JSON_ENCRYPTION_TOKEN), "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_S3_CONFIG, JSON_ENCRYPTION_TOKEN), "moose");
-  cfg.set_value_by_name(fmt::format("{}.{}", JSON_S3_CONFIG, JSON_SECRET_KEY),
-                        "moose");
-
-  auto data = cfg.get_json();
-  EXPECT_FALSE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_FALSE(data.at(JSON_REMOTE_MOUNT)
-                   .at(JSON_ENCRYPTION_TOKEN)
-                   .get<std::string>()
-                   .empty());
-  EXPECT_FALSE(data.at(JSON_S3_CONFIG)
-                   .at(JSON_ENCRYPTION_TOKEN)
-                   .get<std::string>()
-                   .empty());
-  EXPECT_FALSE(
-      data.at(JSON_S3_CONFIG).at(JSON_SECRET_KEY).get<std::string>().empty());
-
-  clean_json_config(cfg.get_provider_type(), data);
-  EXPECT_TRUE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_TRUE(data.at(JSON_REMOTE_MOUNT)
-                  .at(JSON_ENCRYPTION_TOKEN)
-                  .get<std::string>()
-                  .empty());
-  EXPECT_TRUE(data.at(JSON_S3_CONFIG)
-                  .at(JSON_ENCRYPTION_TOKEN)
-                  .get<std::string>()
-                  .empty());
-  EXPECT_TRUE(
-      data.at(JSON_S3_CONFIG).at(JSON_SECRET_KEY).get<std::string>().empty());
-}
-
-TEST(clean_json_test, can_clean_sia_config) {
-  auto dir =
-      utils::path::combine(test::get_test_output_dir(), {
-                                                            "clean_json_test",
-                                                            "sia",
-                                                        });
-  app_config cfg(provider_type::sia, dir);
-  cfg.set_value_by_name(JSON_API_PASSWORD, "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_API_PASSWORD), "moose");
-  cfg.set_value_by_name(
-      fmt::format("{}.{}", JSON_REMOTE_MOUNT, JSON_ENCRYPTION_TOKEN), "moose");
-
-  auto data = cfg.get_json();
-  EXPECT_FALSE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_FALSE(data.at(JSON_HOST_CONFIG)
-                   .at(JSON_API_PASSWORD)
-                   .get<std::string>()
-                   .empty());
-  EXPECT_FALSE(data.at(JSON_REMOTE_MOUNT)
-                   .at(JSON_ENCRYPTION_TOKEN)
-                   .get<std::string>()
-                   .empty());
-
-  clean_json_config(cfg.get_provider_type(), data);
-  EXPECT_TRUE(data.at(JSON_API_PASSWORD).get<std::string>().empty());
-  EXPECT_TRUE(data.at(JSON_HOST_CONFIG)
-                  .at(JSON_API_PASSWORD)
-                  .get<std::string>()
-                  .empty());
-  EXPECT_TRUE(data.at(JSON_REMOTE_MOUNT)
-                  .at(JSON_ENCRYPTION_TOKEN)
-                  .get<std::string>()
-                  .empty());
-}
-} // namespace repertory

repertory/repertory_test/src/lock_data_test.cpp

@@ -62,16 +62,13 @@ TEST(lock_data_test, set_and_unset_mount_state) {
 
   json mount_state;
   EXPECT_TRUE(l.get_mount_state(mount_state));
+
   EXPECT_STREQ(R"({"Active":true,"Location":"C:","PID":99})",
-               mount_state.dump().c_str());
+               mount_state["Sia1"].dump().c_str());
-
-  EXPECT_TRUE(l2.get_mount_state(mount_state));
   EXPECT_STREQ(R"({"Active":true,"Location":"D:","PID":97})",
-               mount_state.dump().c_str());
+               mount_state["Remote1"].dump().c_str());
-
-  EXPECT_TRUE(l3.get_mount_state(mount_state));
   EXPECT_STREQ(R"({"Active":true,"Location":"E:","PID":96})",
-               mount_state.dump().c_str());
+               mount_state["Remote2"].dump().c_str());
 
   EXPECT_TRUE(l.set_mount_state(false, "C:", 99));
   EXPECT_TRUE(l2.set_mount_state(false, "D:", 98));
@@ -79,15 +76,11 @@ TEST(lock_data_test, set_and_unset_mount_state) {
 
   EXPECT_TRUE(l.get_mount_state(mount_state));
   EXPECT_STREQ(R"({"Active":false,"Location":"","PID":-1})",
-               mount_state.dump().c_str());
+               mount_state["Sia1"].dump().c_str());
-
-  EXPECT_TRUE(l2.get_mount_state(mount_state));
   EXPECT_STREQ(R"({"Active":false,"Location":"","PID":-1})",
-               mount_state.dump().c_str());
+               mount_state["Remote1"].dump().c_str());
-
-  EXPECT_TRUE(l3.get_mount_state(mount_state));
   EXPECT_STREQ(R"({"Active":false,"Location":"","PID":-1})",
-               mount_state.dump().c_str());
+               mount_state["Remote2"].dump().c_str());
 }
 #else
 TEST(lock_data_test, set_and_unset_mount_state) {
@@ -98,13 +91,14 @@ TEST(lock_data_test, set_and_unset_mount_state) {
   EXPECT_TRUE(l.get_mount_state(mount_state));
 
   EXPECT_STREQ(R"({"Active":true,"Location":"/mnt/1","PID":99})",
-               mount_state.dump().c_str());
+               mount_state["Sia1"].dump().c_str());
 
   EXPECT_TRUE(l.set_mount_state(false, "/mnt/1", 99));
 
   EXPECT_TRUE(l.get_mount_state(mount_state));
+
   EXPECT_STREQ(R"({"Active":false,"Location":"","PID":-1})",
-               mount_state.dump().c_str());
+               mount_state["Sia1"].dump().c_str());
 }
 #endif
 } // namespace repertory

scripts/copy_mingw64_deps.sh

@@ -15,7 +15,6 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
     /mingw64/bin/libstdc++-6.dll
     /mingw64/bin/libwinpthread-1.dll
     /mingw64/bin/libzlib1.dll
-    /mingw64/bin/libzstd.dll
     /mingw64/bin/zlib1.dll
   )
 

support/src/utils/common.cpp

@@ -25,8 +25,8 @@
 #include "utils/string.hpp"
 
 namespace repertory::utils {
-auto compare_version_strings(std::string version1, std::string version2)
+auto compare_version_strings(std::string version1,
-    -> std::int32_t {
+                             std::string version2) -> std::int32_t {
 
   if (utils::string::contains(version1, "-")) {
     version1 = utils::string::split(version1, '-', true)[0U];
@@ -131,46 +131,23 @@ auto get_next_available_port(std::uint16_t first_port,
   using ip::tcp;
 
   boost::system::error_code error_code{};
-
+  while (first_port != 0U) {
-  std::uint32_t check_port{first_port};
+    io_context ctx{};
-  while (check_port <= 65535U) {
+    tcp::acceptor acceptor(ctx);
-    {
+    acceptor.open(tcp::v4(), error_code) ||
-      io_context ctx{};
+        acceptor.bind({tcp::v4(), first_port}, error_code);
-      tcp::socket socket(ctx);
+    if (not error_code) {
-      socket.connect(
+      break;
-          {
-              tcp::endpoint(ip::address_v4::loopback(),
-                            static_cast<std::uint16_t>(check_port)),
-          },
-          error_code);
-      if (not error_code) {
-        ++check_port;
-        continue;
-      }
     }
 
-    {
+    ++first_port;
-      io_context ctx{};
-      tcp::acceptor acceptor(ctx);
-      acceptor.open(tcp::v4(), error_code);
-      if (error_code) {
-        ++check_port;
-        continue;
-      }
-      acceptor.set_option(boost::asio::ip::tcp::acceptor::linger(true, 0));
-      acceptor.bind({tcp::v4(), static_cast<std::uint16_t>(check_port)},
-                    error_code);
-      if (error_code) {
-        ++check_port;
-        continue;
-      }
-    }
-
-    available_port = static_cast<std::uint16_t>(check_port);
-    return true;
   }
 
-  return false;
+  if (not error_code) {
+    available_port = first_port;
+  }
+
+  return not error_code;
 }
 #endif // defined(PROJECT_ENABLE_BOOST)
 

web/repertory/.cspell/words.txt

@@ -1,8 +1,6 @@
 autofocus
-canvaskit
 cupertino
 cupertinoicons
 fromargb
 onetwothree
-renterd
 rocksdb

web/repertory/lib/constants.dart

@@ -1,11 +1,5 @@
-import 'package:flutter/material.dart' show GlobalKey, NavigatorState;
+const addMountTitle = 'New Mount Settings';
-import 'package:sodium_libs/sodium_libs.dart';
-
-const addMountTitle = 'Add New Mount';
-const appLogonTitle = 'Repertory Portal Login';
-const appSettingsTitle = 'Portal Settings';
 const appTitle = 'Repertory Management Portal';
-const logonWidth = 300.0;
 const databaseTypeList = ['rocksdb', 'sqlite'];
 const downloadTypeList = ['default', 'direct', 'ring_buffer'];
 const eventLevelList = ['critical', 'error', 'warn', 'info', 'debug', 'trace'];
@@ -13,12 +7,3 @@ const padding = 15.0;
 const protocolTypeList = ['http', 'https'];
 const providerTypeList = ['Encrypt', 'Remote', 'S3', 'Sia'];
 const ringBufferSizeList = ['128', '256', '512', '1024', '2048'];
-
-final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
-
-Sodium? _sodium;
-void setSodium(Sodium sodium) {
-  _sodium = sodium;
-}
-
-Sodium get sodium => _sodium!;

web/repertory/lib/helpers.dart

@@ -1,21 +1,9 @@
-import 'package:convert/convert.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/models/auth.dart';
-import 'package:sodium_libs/sodium_libs.dart' show SecureKey, StringX;
 
 typedef Validator = bool Function(String);
 
-class NullPasswordException implements Exception {
-  String error() => 'password cannot be null';
-}
-
-class AuthenticationFailedException implements Exception {
-  String error() => 'failed to authenticate user';
-}
-
 // ignore: prefer_function_declarations_over_variables
 final Validator noRestrictedChars = (value) {
   return [
@@ -74,13 +62,7 @@ Map<String, dynamic> createDefaultSettings(String mountType) {
         'EncryptConfig': {'EncryptionToken': '', 'Path': ''},
       };
     case 'Remote':
-      return {
+      return {'EventLevel': 'info'};
-        'RemoteConfig': {
-          'ApiPort': 20000,
-          'EncryptionToken': '',
-          'HostNameOrIp': '',
-        },
-      };
     case 'S3':
       return {
         'S3Config': {
@@ -107,33 +89,6 @@ Map<String, dynamic> createDefaultSettings(String mountType) {
   return {};
 }
 
-void displayAuthError(Auth auth) {
-  if (!auth.authenticated || constants.navigatorKey.currentContext == null) {
-    return;
-  }
-
-  displayErrorMessage(
-    constants.navigatorKey.currentContext!,
-    "Authentication failed",
-    clear: true,
-  );
-}
-
-void displayErrorMessage(context, String text, {bool clear = false}) {
-  if (!context.mounted) {
-    return;
-  }
-
-  final messenger = ScaffoldMessenger.of(context);
-  if (clear) {
-    messenger.removeCurrentSnackBar();
-  }
-
-  messenger.showSnackBar(
-    SnackBar(content: Text(text, textAlign: TextAlign.center)),
-  );
-}
-
 String formatMountName(String type, String name) {
   if (type == 'remote') {
     return name.replaceAll('_', ':');
@@ -150,22 +105,9 @@ String getBaseUri() {
   return Uri.base.origin;
 }
 
-String? getSettingDescription(String settingPath) {
-  switch (settingPath) {
-    case 'ApiPassword':
-      return "HTTP basic authentication password";
-    case 'ApiUser':
-      return "HTTP basic authentication user";
-    case 'HostConfig.ApiPassword':
-      return "RENTERD_API_PASSWORD";
-    default:
-      return null;
-  }
-}
-
 List<Validator> getSettingValidators(String settingPath) {
   switch (settingPath) {
-    case 'ApiPassword':
+    case 'ApiAuth':
       return [notEmptyValidator];
     case 'DatabaseType':
       return [(value) => constants.databaseTypeList.contains(value)];
@@ -185,8 +127,6 @@ List<Validator> getSettingValidators(String settingPath) {
       return createHostNameOrIpValidators();
     case 'HostConfig.Protocol':
       return [(value) => constants.protocolTypeList.contains(value)];
-    case 'Path':
-      return [trimNotEmptyValidator];
     case 'RemoteConfig.ApiPort':
       return [notEmptyValidator, portIsValid];
     case 'RemoteConfig.EncryptionToken':
@@ -235,168 +175,21 @@ bool validateSettings(
 }) {
   settings.forEach((key, value) {
     final settingKey = rootKey == null ? key : '$rootKey.$key';
-    if (value is Map<String, dynamic>) {
+    if (value is Map) {
-      validateSettings(value, failed, rootKey: settingKey);
+      validateSettings(
-      return;
+        value as Map<String, dynamic>,
-    }
+        failed,
-
+        rootKey: settingKey,
-    for (var validator in getSettingValidators(settingKey)) {
+      );
-      if (validator(value.toString())) {
+    } else {
-        continue;
+      for (var validator in getSettingValidators(settingKey)) {
+        if (validator(value.toString())) {
+          continue;
+        }
+        failed.add(settingKey);
       }
-      failed.add(settingKey);
     }
   });
 
   return failed.isEmpty;
 }
-
-Future<Map<String, dynamic>> convertAllToString(
-  Map<String, dynamic> settings,
-  SecureKey key,
-) async {
-  Future<Map<String, dynamic>> convert(Map<String, dynamic> settings) async {
-    for (var entry in settings.entries) {
-      if (entry.value is Map<String, dynamic>) {
-        await convert(entry.value);
-        continue;
-      }
-
-      if (entry.key == 'ApiPassword' ||
-          entry.key == 'EncryptionToken' ||
-          entry.key == 'SecretKey') {
-        if (entry.value.isEmpty) {
-          continue;
-        }
-
-        settings[entry.key] = encryptValue(entry.value, key);
-        continue;
-      }
-
-      if (entry.value is String) {
-        continue;
-      }
-
-      settings[entry.key] = entry.value.toString();
-    }
-
-    return settings;
-  }
-
-  return convert(settings);
-}
-
-String encryptValue(String value, SecureKey key) {
-  if (value.isEmpty) {
-    return value;
-  }
-
-  final sodium = constants.sodium;
-  final crypto = sodium.crypto.aeadXChaCha20Poly1305IETF;
-
-  final nonce = sodium.secureRandom(crypto.nonceBytes).extractBytes();
-  final data = crypto.encrypt(
-    additionalData: Uint8List.fromList('repertory'.toCharArray()),
-    key: key,
-    message: Uint8List.fromList(value.toCharArray()),
-    nonce: nonce,
-  );
-
-  return hex.encode(nonce + data);
-}
-
-Map<String, dynamic> getChanged(
-  Map<String, dynamic> original,
-  Map<String, dynamic> updated,
-) {
-  if (DeepCollectionEquality().equals(original, updated)) {
-    return {};
-  }
-
-  Map<String, dynamic> changed = {};
-  original.forEach((key, value) {
-    if (DeepCollectionEquality().equals(value, updated[key])) {
-      return;
-    }
-
-    if (value is Map<String, dynamic>) {
-      changed[key] = <String, dynamic>{};
-      value.forEach((subKey, subValue) {
-        if (DeepCollectionEquality().equals(subValue, updated[key][subKey])) {
-          return;
-        }
-
-        changed[key][subKey] = updated[key][subKey];
-      });
-      return;
-    }
-
-    changed[key] = updated[key];
-  });
-
-  return changed;
-}
-
-Future<String?> editMountLocation(
-  context,
-  List<String> available, {
-  bool allowEmpty = false,
-  String? location,
-}) async {
-  String? currentLocation = location;
-  final controller = TextEditingController(text: currentLocation);
-  return await showDialog(
-    context: context,
-    builder: (context) {
-      return StatefulBuilder(
-        builder: (context, setState) {
-          return AlertDialog(
-            actions: [
-              TextButton(
-                child: const Text('Cancel'),
-                onPressed: () => Navigator.of(context).pop(null),
-              ),
-              TextButton(
-                child: const Text('OK'),
-                onPressed: () {
-                  final result = getSettingValidators('Path').firstWhereOrNull(
-                    (validator) => !validator(currentLocation ?? ''),
-                  );
-                  if (result != null) {
-                    return displayErrorMessage(
-                      context,
-                      "Mount location is not valid",
-                    );
-                  }
-                  Navigator.of(context).pop(currentLocation);
-                },
-              ),
-            ],
-            content:
-                available.isEmpty
-                    ? TextField(
-                      autofocus: true,
-                      controller: controller,
-                      onChanged:
-                          (value) => setState(() => currentLocation = value),
-                    )
-                    : DropdownButton<String>(
-                      hint: const Text("Select drive"),
-                      value: currentLocation,
-                      onChanged:
-                          (value) => setState(() => currentLocation = value),
-                      items:
-                          available.map<DropdownMenuItem<String>>((item) {
-                            return DropdownMenuItem<String>(
-                              value: item,
-                              child: Text(item),
-                            );
-                          }).toList(),
-                    ),
-            title: const Text('Mount Location', textAlign: TextAlign.center),
-          );
-        },
-      );
-    },
-  );
-}

web/repertory/lib/main.dart

@@ -2,32 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:repertory/constants.dart' as constants;
 import 'package:repertory/helpers.dart';
-import 'package:repertory/models/auth.dart';
 import 'package:repertory/models/mount.dart';
 import 'package:repertory/models/mount_list.dart';
 import 'package:repertory/screens/add_mount_screen.dart';
-import 'package:repertory/screens/auth_screen.dart';
 import 'package:repertory/screens/edit_mount_screen.dart';
-import 'package:repertory/screens/edit_settings_screen.dart';
 import 'package:repertory/screens/home_screen.dart';
-import 'package:sodium_libs/sodium_libs.dart' show SodiumInit;
 
-void main() async {
+void main() {
-  try {
-    constants.setSodium(await SodiumInit.init());
-  } catch (e) {
-    debugPrint('$e');
-  }
-
-  final auth = Auth();
   runApp(
-    MultiProvider(
+    ChangeNotifierProvider(create: (_) => MountList(), child: const MyApp()),
-      providers: [
-        ChangeNotifierProvider(create: (_) => auth),
-        ChangeNotifierProvider(create: (_) => MountList(auth)),
-      ],
-      child: const MyApp(),
-    ),
   );
 }
 
@@ -47,7 +30,6 @@ class _MyAppState extends State<MyApp> {
     );
 
     return MaterialApp(
-      navigatorKey: constants.navigatorKey,
       themeMode: ThemeMode.dark,
       darkTheme: ThemeData(
         useMaterial3: true,
@@ -62,20 +44,11 @@ class _MyAppState extends State<MyApp> {
         snackBarTheme: snackBarTheme,
       ),
       title: constants.appTitle,
-      initialRoute: '/auth',
+      initialRoute: '/',
       routes: {
-        '/':
+        '/': (context) => const HomeScreen(title: constants.appTitle),
-            (context) =>
-                const AuthCheck(child: HomeScreen(title: constants.appTitle)),
         '/add':
-            (context) => const AuthCheck(
+            (context) => const AddMountScreen(title: constants.addMountTitle),
-              child: AddMountScreen(title: constants.addMountTitle),
-            ),
-        '/auth': (context) => const AuthScreen(title: constants.appTitle),
-        '/settings':
-            (context) => const AuthCheck(
-              child: EditSettingsScreen(title: constants.appSettingsTitle),
-            ),
       },
       onGenerateRoute: (settings) {
         if (settings.name != '/edit') {
@@ -85,12 +58,10 @@ class _MyAppState extends State<MyApp> {
         final mount = settings.arguments as Mount;
         return MaterialPageRoute(
           builder: (context) {
-            return AuthCheck(
+            return EditMountScreen(
-              child: EditMountScreen(
+              mount: mount,
-                mount: mount,
+              title:
-                title:
+                  '${initialCaps(mount.type)} [${formatMountName(mount.type, mount.name)}] Settings',
-                    '${mount.provider} [${formatMountName(mount.type, mount.name)}] Settings',
-              ),
             );
           },
         );
@@ -98,29 +69,3 @@ class _MyAppState extends State<MyApp> {
     );
   }
 }
-
-class AuthCheck extends StatelessWidget {
-  final Widget child;
-  const AuthCheck({super.key, required this.child});
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<Auth>(
-      builder: (context, auth, __) {
-        if (!auth.authenticated) {
-          Future.delayed(Duration(milliseconds: 1), () {
-            if (constants.navigatorKey.currentContext == null) {
-              return;
-            }
-            Navigator.of(
-              constants.navigatorKey.currentContext!,
-            ).pushNamedAndRemoveUntil('/auth', (Route<dynamic> route) => false);
-          });
-          return child;
-        }
-
-        return child;
-      },
-    );
-  }
-}

web/repertory/lib/models/auth.dart

@@ -1,64 +0,0 @@
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/helpers.dart';
-import 'package:repertory/models/mount_list.dart';
-import 'package:sodium_libs/sodium_libs.dart';
-
-class Auth with ChangeNotifier {
-  bool _authenticated = false;
-  SecureKey _key = SecureKey.random(constants.sodium, 32);
-  String _user = "";
-  MountList? mountList;
-
-  bool get authenticated => _authenticated;
-  SecureKey get key => _key;
-
-  Future<void> authenticate(String user, String password) async {
-    final sodium = constants.sodium;
-
-    final keyHash = sodium.crypto.genericHash(
-      outLen: sodium.crypto.aeadXChaCha20Poly1305IETF.keyBytes,
-      message: Uint8List.fromList(password.toCharArray()),
-    );
-
-    _authenticated = true;
-    _key = SecureKey.fromList(sodium, keyHash);
-    _user = user;
-
-    notifyListeners();
-  }
-
-  Future<String> createAuth() async {
-    try {
-      final response = await http.get(
-        Uri.parse(Uri.encodeFull('${getBaseUri()}/api/v1/nonce')),
-      );
-
-      if (response.statusCode != 200) {
-        logoff();
-        return "";
-      }
-
-      final nonce = jsonDecode(response.body)["nonce"];
-      return encryptValue('${_user}_$nonce', key);
-    } catch (e) {
-      debugPrint('$e');
-    }
-
-    return "";
-  }
-
-  void logoff() {
-    _authenticated = false;
-    _key = SecureKey.random(constants.sodium, 32);
-    _user = "";
-
-    notifyListeners();
-
-    mountList?.clear();
-  }
-}

web/repertory/lib/models/mount.dart

@@ -3,62 +3,36 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:repertory/helpers.dart';
-import 'package:repertory/models/auth.dart';
-import 'package:repertory/models/mount_list.dart';
 import 'package:repertory/types/mount_config.dart';
 
 class Mount with ChangeNotifier {
-  final Auth _auth;
   final MountConfig mountConfig;
-  final MountList? _mountList;
+  Mount(this.mountConfig, {isAdd = false}) {
-  bool _isMounting = false;
-  bool _isRefreshing = false;
-
-  Mount(this._auth, this.mountConfig, this._mountList, {isAdd = false}) {
     if (isAdd) {
       return;
     }
     refresh();
   }
 
-  String? get bucket => mountConfig.bucket;
-  String get id => '${type}_$name';
-  bool? get mounted => mountConfig.mounted;
   String get name => mountConfig.name;
   String get path => mountConfig.path;
-  String get provider => mountConfig.provider;
+  IconData get state => mountConfig.state;
   String get type => mountConfig.type;
 
   Future<void> _fetch() async {
     try {
-      final auth = await _auth.createAuth();
       final response = await http.get(
         Uri.parse(
-          Uri.encodeFull(
+          Uri.encodeFull('${getBaseUri()}/api/v1/mount?name=$name&type=$type'),
-            '${getBaseUri()}/api/v1/mount?auth=$auth&name=$name&type=$type',
-          ),
         ),
       );
 
-      if (response.statusCode == 401) {
-        _auth.logoff();
-        return;
-      }
-
-      if (response.statusCode == 404) {
-        _mountList?.reset();
-        return;
-      }
-
       if (response.statusCode != 200) {
         return;
       }
 
-      if (_isMounting) {
-        return;
-      }
-
       mountConfig.updateSettings(jsonDecode(response.body));
+
       notifyListeners();
     } catch (e) {
       debugPrint('$e');
@@ -67,33 +41,18 @@ class Mount with ChangeNotifier {
 
   Future<void> _fetchStatus() async {
     try {
-      final auth = await _auth.createAuth();
       final response = await http.get(
         Uri.parse(
           Uri.encodeFull(
-            '${getBaseUri()}/api/v1/mount_status?auth=$auth&name=$name&type=$type',
+            '${getBaseUri()}/api/v1/mount_status?name=$name&type=$type',
           ),
         ),
       );
 
-      if (response.statusCode == 401) {
-        _auth.logoff();
-        return;
-      }
-
-      if (response.statusCode == 404) {
-        _mountList?.reset();
-        return;
-      }
-
       if (response.statusCode != 200) {
         return;
       }
 
-      if (_isMounting) {
-        return;
-      }
-
       mountConfig.updateStatus(jsonDecode(response.body));
       notifyListeners();
     } catch (e) {
@@ -101,185 +60,62 @@ class Mount with ChangeNotifier {
     }
   }
 
-  Future<void> setMountLocation(String location) async {
+  Future<void> mount(bool unmount, {String? location}) async {
     try {
-      mountConfig.path = location;
+      await http.post(
-
-      final auth = await _auth.createAuth();
-      final response = await http.put(
         Uri.parse(
           Uri.encodeFull(
-            '${getBaseUri()}/api/v1/mount_location?auth=$auth&name=$name&type=$type&location=$location',
+            '${getBaseUri()}/api/v1/mount?unmount=$unmount&name=$name&type=$type&location=$location',
           ),
         ),
       );
 
-      if (response.statusCode == 401) {
-        _auth.logoff();
-        return;
-      }
-
-      if (response.statusCode == 404) {
-        _mountList?.reset();
-        return;
-      }
-
       return refresh();
     } catch (e) {
       debugPrint('$e');
     }
   }
 
-  Future<List<String>> getAvailableLocations() async {
+  Future<void> refresh() async {
-    try {
+    await _fetch();
-      final auth = await _auth.createAuth();
+    return _fetchStatus();
-      final response = await http.get(
-        Uri.parse(
-          Uri.encodeFull('${getBaseUri()}/api/v1/locations?auth=$auth'),
-        ),
-      );
-
-      if (response.statusCode == 401) {
-        _auth.logoff();
-        return <String>[];
-      }
-
-      if (response.statusCode != 200) {
-        return <String>[];
-      }
-
-      return (jsonDecode(response.body) as List).cast<String>();
-    } catch (e) {
-      debugPrint('$e');
-    }
-
-    return <String>[];
   }
 
-  Future<String?> getMountLocation() async {
+  Future<void> setValue(String key, String value) async {
     try {
-      final auth = await _auth.createAuth();
+      await http.put(
-      final response = await http.get(
         Uri.parse(
           Uri.encodeFull(
-            '${getBaseUri()}/api/v1/mount_location?auth=$auth&name=$name&type=$type',
+            '${getBaseUri()}/api/v1/set_value_by_name?name=$name&type=$type&key=$key&value=$value',
           ),
         ),
       );
 
-      if (response.statusCode == 401) {
+      return refresh();
-        _auth.logoff();
+    } catch (e) {
-        return null;
+      debugPrint('$e');
-      }
+    }
+  }
+
+  Future<String?> getMountLocation() async {
+    try {
+      final response = await http.get(
+        Uri.parse(
+          Uri.encodeFull(
+            '${getBaseUri()}/api/v1/get_mount_location?name=$name&type=$type',
+          ),
+        ),
+      );
 
       if (response.statusCode != 200) {
         return null;
       }
 
-      final location = jsonDecode(response.body)['Location'] as String;
+      return jsonDecode(response.body)['Location'] as String;
-      return location.trim().isEmpty ? null : location;
     } catch (e) {
       debugPrint('$e');
     }
 
     return null;
   }
-
-  Future<bool> mount(bool unmount, {String? location}) async {
-    try {
-      _isMounting = true;
-
-      mountConfig.mounted = null;
-      notifyListeners();
-
-      var count = 0;
-      while (_isRefreshing && count++ < 10) {
-        await Future.delayed(Duration(seconds: 1));
-      }
-
-      final auth = await _auth.createAuth();
-      final response = await http.post(
-        Uri.parse(
-          Uri.encodeFull(
-            '${getBaseUri()}/api/v1/mount?auth=$auth&unmount=$unmount&name=$name&type=$type&location=$location',
-          ),
-        ),
-      );
-
-      if (response.statusCode == 401) {
-        displayAuthError(_auth);
-        _auth.logoff();
-        return false;
-      }
-
-      if (response.statusCode == 404) {
-        _isMounting = false;
-        _mountList?.reset();
-        return true;
-      }
-
-      final badLocation = (!unmount && response.statusCode == 500);
-      if (badLocation) {
-        mountConfig.path = "";
-      }
-
-      await refresh(force: true);
-      _isMounting = false;
-
-      return !badLocation;
-    } catch (e) {
-      debugPrint('$e');
-    }
-
-    _isMounting = false;
-    return true;
-  }
-
-  Future<void> refresh({bool force = false}) async {
-    if (!force && (_isMounting || _isRefreshing)) {
-      return;
-    }
-
-    _isRefreshing = true;
-
-    try {
-      await _fetch();
-      await _fetchStatus();
-    } catch (e) {
-      debugPrint('$e');
-    }
-
-    _isRefreshing = false;
-  }
-
-  Future<void> setValue(String key, String value) async {
-    try {
-      final auth = await _auth.createAuth();
-      final response = await http.put(
-        Uri.parse(
-          Uri.encodeFull(
-            '${getBaseUri()}/api/v1/set_value_by_name?auth=$auth&name=$name&type=$type&key=$key&value=$value',
-          ),
-        ),
-      );
-
-      if (response.statusCode == 401) {
-        _auth.logoff();
-        return;
-      }
-
-      if (response.statusCode == 404) {
-        _mountList?.reset();
-        return;
-      }
-
-      if (response.statusCode != 200) {
-        return;
-      }
-
-      return refresh();
-    } catch (e) {
-      debugPrint('$e');
-    }
-  }
 }

web/repertory/lib/models/mount_list.dart

@@ -1,92 +1,35 @@
 import 'dart:convert';
-import 'dart:math';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart' show ModalRoute;
 import 'package:http/http.dart' as http;
-import 'package:repertory/constants.dart' as constants;
 import 'package:repertory/helpers.dart';
-import 'package:repertory/models/auth.dart';
-import 'package:repertory/models/mount.dart';
 import 'package:repertory/types/mount_config.dart';
 
 class MountList with ChangeNotifier {
-  final Auth _auth;
+  MountList() {
-
+    _fetch();
-  MountList(this._auth) {
-    _auth.mountList = this;
-    _auth.addListener(() {
-      if (_auth.authenticated) {
-        _fetch();
-      }
-    });
   }
 
-  List<Mount> _mountList = [];
+  List<MountConfig> _mountList = [];
 
-  Auth get auth => _auth;
+  UnmodifiableListView<MountConfig> get items =>
-
+      UnmodifiableListView<MountConfig>(_mountList);
-  UnmodifiableListView<Mount> get items =>
-      UnmodifiableListView<Mount>(_mountList);
-
-  bool hasBucketName(String mountType, String bucket, {String? excludeName}) {
-    final list = items.where(
-      (item) => item.type.toLowerCase() == mountType.toLowerCase(),
-    );
-
-    return (excludeName == null
-                ? list
-                : list.whereNot(
-                  (item) =>
-                      item.name.toLowerCase() == excludeName.toLowerCase(),
-                ))
-            .firstWhereOrNull((Mount item) {
-              return item.bucket != null &&
-                  item.bucket!.toLowerCase() == bucket.toLowerCase();
-            }) !=
-        null;
-  }
-
-  bool hasConfigName(String name) {
-    return items.firstWhereOrNull(
-          (item) => item.name.toLowerCase() == name.toLowerCase(),
-        ) !=
-        null;
-  }
 
   Future<void> _fetch() async {
     try {
-      final auth = await _auth.createAuth();
       final response = await http.get(
-        Uri.parse('${getBaseUri()}/api/v1/mount_list?auth=$auth'),
+        Uri.parse('${getBaseUri()}/api/v1/mount_list'),
       );
 
-      if (response.statusCode == 401) {
-        displayAuthError(_auth);
-        _auth.logoff();
-        return;
-      }
-
-      if (response.statusCode == 404) {
-        reset();
-        return;
-      }
-
       if (response.statusCode != 200) {
         return;
       }
+      List<MountConfig> nextList = [];
 
-      List<Mount> nextList = [];
+      jsonDecode(response.body).forEach((key, value) {
-
-      jsonDecode(response.body).forEach((type, value) {
         nextList.addAll(
-          value
+          value.map((name) => MountConfig.fromJson(key, name)).toList(),
-              .map(
-                (name) =>
-                    Mount(_auth, MountConfig(type: type, name: name), this),
-              )
-              .toList(),
         );
       });
       _sort(nextList);
@@ -109,93 +52,29 @@ class MountList with ChangeNotifier {
     });
   }
 
-  Future<bool> add(
+  Future<void> add(
     String type,
     String name,
-    Map<String, dynamic> settings,
+    Map<String, dynamic> mountConfig,
   ) async {
-    var ret = false;
-
-    var apiPort = settings['ApiPort'] ?? 10000;
-    for (var mount in _mountList) {
-      var port = mount.mountConfig.settings['ApiPort'] as int?;
-      if (port != null) {
-        apiPort = max(apiPort, port + 1);
-      }
-    }
-    settings["ApiPort"] = apiPort;
-
-    displayError() {
-      if (constants.navigatorKey.currentContext == null) {
-        return;
-      }
-
-      displayErrorMessage(
-        constants.navigatorKey.currentContext!,
-        'Add mount failed. Please try again.',
-      );
-    }
-
     try {
-      final auth = await _auth.createAuth();
+      await http.post(
-      final map = await convertAllToString(
-        jsonDecode(jsonEncode(settings)),
-        _auth.key,
-      );
-      final response = await http.post(
         Uri.parse(
           Uri.encodeFull(
-            '${getBaseUri()}/api/v1/add_mount?auth=$auth&name=$name&type=$type&config=${jsonEncode(map)}',
+            '${getBaseUri()}/api/v1/add_mount?name=$name&type=$type&config=${jsonEncode(mountConfig)}',
           ),
         ),
       );
 
-      switch (response.statusCode) {
+      return _fetch();
-        case 200:
-          ret = true;
-          break;
-        case 401:
-          displayAuthError(_auth);
-          _auth.logoff();
-          break;
-        case 404:
-          reset();
-          break;
-        default:
-          displayError();
-          break;
-      }
     } catch (e) {
       debugPrint('$e');
-      displayError();
     }
-
-    if (ret) {
-      await _fetch();
-    }
-
-    return ret;
   }
 
-  void clear() {
+  void remove(String name) {
-    _mountList = [];
+    _mountList.removeWhere((item) => item.name == name);
+
     notifyListeners();
   }
-
-  Future<void> reset() async {
-    if (constants.navigatorKey.currentContext == null ||
-        ModalRoute.of(constants.navigatorKey.currentContext!)?.settings.name !=
-            '/') {
-      await constants.navigatorKey.currentState?.pushReplacementNamed('/');
-    }
-
-    displayErrorMessage(
-      constants.navigatorKey.currentContext!,
-      'Mount removed externally. Reloading...',
-    );
-
-    clear();
-
-    return _fetch();
-  }
 }

web/repertory/lib/screens/add_mount_screen.dart

@@ -1,9 +1,9 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:repertory/constants.dart' as constants;
 import 'package:repertory/helpers.dart';
-import 'package:repertory/models/auth.dart';
 import 'package:repertory/models/mount.dart';
 import 'package:repertory/models/mount_list.dart';
 import 'package:repertory/types/mount_config.dart';
@@ -28,6 +28,7 @@ class _AddMountScreenState extends State<AddMountScreen> {
     "S3": createDefaultSettings("S3"),
     "Sia": createDefaultSettings("Sia"),
   };
+  bool _showAdvanced = false;
 
   @override
   Widget build(BuildContext context) {
@@ -36,199 +37,176 @@ class _AddMountScreenState extends State<AddMountScreen> {
         backgroundColor: Theme.of(context).colorScheme.inversePrimary,
         title: Text(widget.title),
         actions: [
-          Consumer<Auth>(
+          Row(
-            builder: (context, auth, _) {
+            children: [
-              return IconButton(
+              const Text("Advanced"),
-                icon: const Icon(Icons.logout),
+              IconButton(
-                onPressed: () => auth.logoff(),
+                icon: Icon(_showAdvanced ? Icons.toggle_on : Icons.toggle_off),
-              );
+                onPressed: () => setState(() => _showAdvanced = !_showAdvanced),
-            },
+              ),
+            ],
           ),
         ],
       ),
       body: Padding(
         padding: const EdgeInsets.all(constants.padding),
-        child: Consumer<Auth>(
+        child: Column(
-          builder: (context, auth, _) {
+          crossAxisAlignment: CrossAxisAlignment.start,
-            return Column(
+          mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.max,
-              mainAxisAlignment: MainAxisAlignment.start,
+          children: [
-              mainAxisSize: MainAxisSize.max,
+            Card(
-              children: [
+              child: Padding(
-                Card(
+                padding: const EdgeInsets.all(constants.padding),
-                  margin: EdgeInsets.all(0.0),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const Text('Provider Type'),
+                    const SizedBox(width: constants.padding),
+                    DropdownButton<String>(
+                      value: _mountType,
+                      onChanged: (mountType) {
+                        _handleChange(mountType ?? '');
+                      },
+                      items:
+                          constants.providerTypeList
+                              .map<DropdownMenuItem<String>>((item) {
+                                return DropdownMenuItem<String>(
+                                  value: item,
+                                  child: Text(item),
+                                );
+                              })
+                              .toList(),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            if (_mountType.isNotEmpty)
+              const SizedBox(height: constants.padding),
+            if (_mountType.isNotEmpty)
+              Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(constants.padding),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      const Text('Configuration Name'),
+                      const SizedBox(width: constants.padding),
+                      TextField(
+                        autofocus: true,
+                        controller: _mountNameController,
+                        keyboardType: TextInputType.text,
+                        inputFormatters: [
+                          FilteringTextInputFormatter.deny(RegExp(r'\s')),
+                        ],
+                        onChanged: (_) => _handleChange(_mountType),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            if (_mount != null)
+              Expanded(
+                child: Card(
                   child: Padding(
                     padding: const EdgeInsets.all(constants.padding),
-                    child: Row(
+                    child: MountSettingsWidget(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                      isAdd: true,
-                      mainAxisAlignment: MainAxisAlignment.start,
+                      mount: _mount!,
-                      mainAxisSize: MainAxisSize.min,
+                      settings: _settings[_mountType]!,
-                      children: [
+                      showAdvanced: _showAdvanced,
-                        const Text('Provider Type'),
-                        const SizedBox(width: constants.padding),
-                        DropdownButton<String>(
-                          autofocus: true,
-                          value: _mountType,
-                          onChanged:
-                              (mountType) =>
-                                  _handleChange(auth, mountType ?? ''),
-                          items:
-                              constants.providerTypeList
-                                  .map<DropdownMenuItem<String>>((item) {
-                                    return DropdownMenuItem<String>(
-                                      value: item,
-                                      child: Text(item),
-                                    );
-                                  })
-                                  .toList(),
-                        ),
-                      ],
                     ),
                   ),
                 ),
-                if (_mountType.isNotEmpty && _mountType != 'Remote')
+              ),
-                  const SizedBox(height: constants.padding),
+            if (_mount != null)
-                if (_mountType.isNotEmpty && _mountType != 'Remote')
+              Builder(
-                  Card(
+                builder: (context) {
-                    margin: EdgeInsets.all(0.0),
+                  return ElevatedButton.icon(
-                    child: Padding(
+                    onPressed: () {
-                      padding: const EdgeInsets.all(constants.padding),
+                      final mountList = Provider.of<MountList>(
-                      child: Column(
+                        context,
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                        listen: false,
-                        mainAxisAlignment: MainAxisAlignment.start,
+                      );
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          const Text('Configuration Name'),
-                          const SizedBox(width: constants.padding),
-                          TextField(
-                            autofocus: true,
-                            controller: _mountNameController,
-                            keyboardType: TextInputType.text,
-                            inputFormatters: [
-                              FilteringTextInputFormatter.deny(RegExp(r'\s')),
-                            ],
-                            onChanged: (_) => _handleChange(auth, _mountType),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                if (_mount != null) const SizedBox(height: constants.padding),
-                if (_mount != null)
-                  Expanded(
-                    child: Card(
-                      margin: EdgeInsets.all(0.0),
-                      child: Padding(
-                        padding: const EdgeInsets.all(constants.padding),
-                        child: MountSettingsWidget(
-                          isAdd: true,
-                          mount: _mount!,
-                          settings: _settings[_mountType]!,
-                          showAdvanced: false,
-                        ),
-                      ),
-                    ),
-                  ),
-                if (_mount != null) const SizedBox(height: constants.padding),
-                if (_mount != null)
-                  Row(
-                    children: [
-                      ElevatedButton.icon(
-                        label: const Text('Add'),
-                        icon: const Icon(Icons.add),
-                        onPressed: () async {
-                          final mountList = Provider.of<MountList>(context);
 
-                          List<String> failed = [];
+                      List<String> failed = [];
-                          if (!validateSettings(
+                      if (!validateSettings(_settings[_mountType]!, failed)) {
-                            _settings[_mountType]!,
+                        for (var key in failed) {
-                            failed,
+                          ScaffoldMessenger.of(context).showSnackBar(
-                          )) {
+                            SnackBar(
-                            for (var key in failed) {
+                              content: Text(
-                              displayErrorMessage(
+                                "'$key' is not valid",
-                                context,
+                                textAlign: TextAlign.center,
-                                "Setting '$key' is not valid",
+                              ),
-                              );
+                            ),
-                            }
-                            return;
-                          }
-
-                          if (mountList.hasConfigName(
-                            _mountNameController.text,
-                          )) {
-                            return displayErrorMessage(
-                              context,
-                              "Configuration name '${_mountNameController.text}' already exists",
-                            );
-                          }
-
-                          if (_mountType == "Sia" || _mountType == "S3") {
-                            final bucket =
-                                _settings[_mountType]!["${_mountType}Config"]["Bucket"]
-                                    as String;
-                            if (mountList.hasBucketName(_mountType, bucket)) {
-                              return displayErrorMessage(
-                                context,
-                                "Bucket '$bucket' already exists",
-                              );
-                            }
-                          }
-
-                          final success = await mountList.add(
-                            _mountType,
-                            _mountType == 'Remote'
-                                ? '${_settings[_mountType]!['RemoteConfig']['HostNameOrIp']}_${_settings[_mountType]!['RemoteConfig']['ApiPort']}'
-                                : _mountNameController.text,
-                            _settings[_mountType]!,
                           );
+                        }
+                        return;
+                      }
 
-                          if (!success || !context.mounted) {
+                      final existingMount = mountList.items.firstWhereOrNull(
-                            return;
+                        (item) =>
-                          }
+                            item.name.toLowerCase() ==
+                            _mountNameController.text.toLowerCase(),
+                      );
 
-                          Navigator.pop(context);
+                      if (existingMount != null) {
-                        },
+                        ScaffoldMessenger.of(context).showSnackBar(
-                      ),
+                          SnackBar(
-                      if (_mountType == 'Sia' || _mountType == 'S3') ...[
+                            content: Text(
-                        const SizedBox(width: constants.padding),
+                              "'${_mountNameController.text}' already exists",
-                        ElevatedButton.icon(
+                              textAlign: TextAlign.center,
-                          label: const Text('Test'),
+                            ),
-                          icon: const Icon(Icons.check),
+                          ),
-                          onPressed: () async {},
+                        );
-                        ),
+                        return;
-                      ],
+                      }
-                    ],
+
-                  ),
+                      mountList.add(
-              ],
+                        _mountType,
-            );
+                        _mountNameController.text,
-          },
+                        _settings[_mountType]!,
+                      );
+
+                      Navigator.pop(context);
+                    },
+                    label: const Text('Add'),
+                    icon: Icon(Icons.add),
+                  );
+                },
+              ),
+          ],
         ),
       ),
     );
   }
 
-  void _handleChange(Auth auth, String mountType) {
+  void _handleChange(String mountType) {
-    setState(() {
+    if (_mountType == mountType) {
-      final changed = _mountType != mountType;
+      return;
+    }
 
+    setState(() {
       _mountType = mountType;
-      if (_mountType == 'Remote') {
+      _mountNameController.text =
-        _mountNameController.text = 'remote';
+          (mountType == 'Sia' && _mountNameController.text.isEmpty)
-      } else if (changed) {
+              ? 'default'
-        _mountNameController.text = mountType == 'Sia' ? 'default' : '';
+              : '';
-      }
 
       _mount =
           (_mountNameController.text.isEmpty)
               ? null
               : Mount(
-                auth,
                 MountConfig(
                   name: _mountNameController.text,
                   settings: _settings[mountType],
                   type: mountType,
                 ),
-                null,
                 isAdd: true,
               );
     });

web/repertory/lib/screens/auth_screen.dart

@@ -1,116 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/models/auth.dart';
-
-class AuthScreen extends StatefulWidget {
-  final String title;
-  const AuthScreen({super.key, required this.title});
-
-  @override
-  State<AuthScreen> createState() => _AuthScreenState();
-}
-
-class _AuthScreenState extends State<AuthScreen> {
-  bool _enabled = true;
-  final _passwordController = TextEditingController();
-  final _userController = TextEditingController();
-
-  @override
-  Widget build(context) {
-    return Scaffold(
-      appBar: AppBar(
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        title: Text(widget.title),
-      ),
-      body: Consumer<Auth>(
-        builder: (context, auth, _) {
-          if (auth.authenticated) {
-            Future.delayed(Duration(milliseconds: 1), () {
-              if (constants.navigatorKey.currentContext == null) {
-                return;
-              }
-
-              Navigator.of(
-                constants.navigatorKey.currentContext!,
-              ).pushNamedAndRemoveUntil('/', (Route<dynamic> route) => false);
-            });
-            return SizedBox.shrink();
-          }
-
-          createLoginHandler() {
-            return _enabled
-                ? () async {
-                  setState(() => _enabled = false);
-                  await auth.authenticate(
-                    _userController.text,
-                    _passwordController.text,
-                  );
-                  setState(() => _enabled = true);
-                }
-                : null;
-          }
-
-          return Center(
-            child: Card(
-              child: Padding(
-                padding: const EdgeInsets.all(constants.padding),
-                child: SizedBox(
-                  width: constants.logonWidth,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Text(
-                        constants.appLogonTitle,
-                        textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      const SizedBox(height: constants.padding),
-                      TextField(
-                        autofocus: true,
-                        decoration: InputDecoration(labelText: 'Username'),
-                        controller: _userController,
-                        textInputAction: TextInputAction.next,
-                      ),
-                      const SizedBox(height: constants.padding),
-                      TextField(
-                        obscureText: true,
-                        decoration: InputDecoration(labelText: 'Password'),
-                        controller: _passwordController,
-                        textInputAction: TextInputAction.go,
-                        onSubmitted: (_) {
-                          final handler = createLoginHandler();
-                          if (handler == null) {
-                            return;
-                          }
-
-                          handler();
-                        },
-                      ),
-                      const SizedBox(height: constants.padding),
-                      ElevatedButton(
-                        onPressed: createLoginHandler(),
-                        child: const Text('Login'),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  @override
-  void setState(VoidCallback fn) {
-    if (!mounted) {
-      return;
-    }
-
-    super.setState(fn);
-  }
-}

web/repertory/lib/screens/edit_mount_screen.dart

@@ -1,8 +1,6 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:repertory/models/auth.dart';
 import 'package:repertory/models/mount.dart';
 import 'package:repertory/widgets/mount_settings.dart';
 
@@ -27,25 +25,10 @@ class _EditMountScreenState extends State<EditMountScreen> {
         actions: [
           Row(
             children: [
-              Row(
+              const Text("Advanced"),
-                children: [
+              IconButton(
-                  const Text("Advanced"),
+                icon: Icon(_showAdvanced ? Icons.toggle_on : Icons.toggle_off),
-                  IconButton(
+                onPressed: () => setState(() => _showAdvanced = !_showAdvanced),
-                    icon: Icon(
-                      _showAdvanced ? Icons.toggle_on : Icons.toggle_off,
-                    ),
-                    onPressed:
-                        () => setState(() => _showAdvanced = !_showAdvanced),
-                  ),
-                ],
-              ),
-              Consumer<Auth>(
-                builder: (context, auth, _) {
-                  return IconButton(
-                    icon: const Icon(Icons.logout),
-                    onPressed: () => auth.logoff(),
-                  );
-                },
               ),
             ],
           ),

web/repertory/lib/screens/edit_settings_screen.dart

@@ -1,87 +0,0 @@
-import 'dart:convert' show jsonDecode, jsonEncode;
-
-import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-import 'package:provider/provider.dart';
-import 'package:repertory/helpers.dart';
-import 'package:repertory/models/auth.dart';
-import 'package:repertory/widgets/ui_settings.dart';
-
-class EditSettingsScreen extends StatefulWidget {
-  final String title;
-  const EditSettingsScreen({super.key, required this.title});
-
-  @override
-  State<EditSettingsScreen> createState() => _EditSettingsScreenState();
-}
-
-class _EditSettingsScreenState extends State<EditSettingsScreen> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        title: Text(widget.title),
-        actions: [
-          Consumer<Auth>(
-            builder: (context, auth, _) {
-              return IconButton(
-                icon: const Icon(Icons.logout),
-                onPressed: () => auth.logoff(),
-              );
-            },
-          ),
-        ],
-      ),
-      body: FutureBuilder(
-        builder: (context, snapshot) {
-          if (!snapshot.hasData) {
-            return Center(child: CircularProgressIndicator());
-          }
-
-          return UISettingsWidget(
-            origSettings: jsonDecode(jsonEncode(snapshot.requireData)),
-            settings: snapshot.requireData,
-            showAdvanced: false,
-          );
-        },
-        future: _grabSettings(),
-        initialData: <String, dynamic>{},
-      ),
-    );
-  }
-
-  Future<Map<String, dynamic>> _grabSettings() async {
-    try {
-      final authProvider = Provider.of<Auth>(context, listen: false);
-      final auth = await authProvider.createAuth();
-      final response = await http.get(
-        Uri.parse('${getBaseUri()}/api/v1/settings?auth=$auth'),
-      );
-
-      if (response.statusCode == 401) {
-        authProvider.logoff();
-        return {};
-      }
-
-      if (response.statusCode != 200) {
-        return {};
-      }
-
-      return jsonDecode(response.body);
-    } catch (e) {
-      debugPrint('$e');
-    }
-
-    return {};
-  }
-
-  @override
-  void setState(VoidCallback fn) {
-    if (!mounted) {
-      return;
-    }
-
-    super.setState(fn);
-  }
-}

web/repertory/lib/screens/home_screen.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/models/auth.dart';
 import 'package:repertory/widgets/mount_list_widget.dart';
 
 class HomeScreen extends StatefulWidget {
@@ -18,26 +15,10 @@ class _HomeScreeState extends State<HomeScreen> {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        leading: IconButton(
+        leading: const Icon(Icons.storage),
-          onPressed: () => Navigator.pushNamed(context, '/settings'),
-          icon: const Icon(Icons.storage),
-        ),
         title: Text(widget.title),
-        actions: [
-          Consumer<Auth>(
-            builder: (context, auth, _) {
-              return IconButton(
-                icon: const Icon(Icons.logout),
-                onPressed: () => auth.logoff(),
-              );
-            },
-          ),
-        ],
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(constants.padding),
-        child: MountListWidget(),
       ),
+      body: MountListWidget(),
       floatingActionButton: FloatingActionButton(
         onPressed: () => Navigator.pushNamed(context, '/add'),
         tooltip: 'Add Mount',

web/repertory/lib/settings.dart

@@ -1,390 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/helpers.dart' show Validator, displayErrorMessage;
-import 'package:settings_ui/settings_ui.dart';
-
-void createBooleanSetting(
-  context,
-  List<Widget> list,
-  Map<String, dynamic> settings,
-  String key,
-  value,
-  bool isAdvanced,
-  bool showAdvanced,
-  widget,
-  Function setState, {
-  String? description,
-  IconData icon = Icons.quiz,
-}) {
-  if (!isAdvanced || showAdvanced) {
-    list.add(
-      SettingsTile.switchTile(
-        leading: Icon(icon),
-        title: createSettingTitle(context, key, description),
-        initialValue: (value as bool),
-        onPressed: (_) => setState(() => settings[key] = !value),
-        onToggle: (bool nextValue) {
-          setState(() => settings[key] = nextValue);
-        },
-      ),
-    );
-  }
-}
-
-void createIntListSetting(
-  context,
-  List<Widget> list,
-  Map<String, dynamic> settings,
-  String key,
-  value,
-  List<String> valueList,
-  defaultValue,
-  IconData icon,
-  bool isAdvanced,
-  bool showAdvanced,
-  widget,
-  Function setState, {
-  String? description,
-}) {
-  if (!isAdvanced || widget.showAdvanced) {
-    list.add(
-      SettingsTile.navigation(
-        title: createSettingTitle(context, key, description),
-        leading: Icon(icon),
-        value: DropdownButton<String>(
-          value: value.toString(),
-          onChanged: (newValue) {
-            setState(
-              () =>
-                  settings[key] = int.parse(
-                    newValue ?? defaultValue.toString(),
-                  ),
-            );
-          },
-          items:
-              valueList.map<DropdownMenuItem<String>>((item) {
-                return DropdownMenuItem<String>(value: item, child: Text(item));
-              }).toList(),
-        ),
-      ),
-    );
-  }
-}
-
-void createIntSetting(
-  context,
-  List<Widget> list,
-  Map<String, dynamic> settings,
-  String key,
-  value,
-  bool isAdvanced,
-  bool showAdvanced,
-  widget,
-  Function setState, {
-  String? description,
-  IconData icon = Icons.onetwothree,
-  List<Validator> validators = const [],
-}) {
-  if (!isAdvanced || widget.showAdvanced) {
-    list.add(
-      SettingsTile.navigation(
-        leading: Icon(icon),
-        title: createSettingTitle(context, key, description),
-        value: Text(value.toString()),
-        onPressed: (_) {
-          String updatedValue = value.toString();
-          showDialog(
-            context: context,
-            builder: (context) {
-              return AlertDialog(
-                actions: [
-                  TextButton(
-                    child: const Text('Cancel'),
-                    onPressed: () => Navigator.of(context).pop(),
-                  ),
-                  TextButton(
-                    child: const Text('OK'),
-                    onPressed: () {
-                      final result = validators.firstWhereOrNull(
-                        (validator) => !validator(updatedValue),
-                      );
-                      if (result != null) {
-                        return displayErrorMessage(
-                          context,
-                          "Setting '$key' is not valid",
-                        );
-                      }
-                      setState(() => settings[key] = int.parse(updatedValue));
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                ],
-                content: TextField(
-                  autofocus: true,
-                  controller: TextEditingController(text: updatedValue),
-                  inputFormatters: [FilteringTextInputFormatter.digitsOnly],
-                  keyboardType: TextInputType.number,
-                  onChanged: (nextValue) => updatedValue = nextValue,
-                ),
-                title: createSettingTitle(context, key, description),
-              );
-            },
-          );
-        },
-      ),
-    );
-  }
-}
-
-void createPasswordSetting(
-  context,
-  List<Widget> list,
-  Map<String, dynamic> settings,
-  String key,
-  value,
-  bool isAdvanced,
-  bool showAdvanced,
-  widget,
-  Function setState, {
-  String? description,
-  IconData icon = Icons.password,
-  List<Validator> validators = const [],
-}) {
-  if (!isAdvanced || widget.showAdvanced) {
-    list.add(
-      SettingsTile.navigation(
-        leading: Icon(icon),
-        title: createSettingTitle(context, key, description),
-        value: Text('*' * (value as String).length),
-        onPressed: (_) {
-          String updatedValue1 = value;
-          String updatedValue2 = value;
-          bool hidePassword1 = true;
-          bool hidePassword2 = true;
-          showDialog(
-            context: context,
-            builder: (context) {
-              return StatefulBuilder(
-                builder: (context, setDialogState) {
-                  return AlertDialog(
-                    actions: [
-                      TextButton(
-                        child: const Text('Cancel'),
-                        onPressed: () => Navigator.of(context).pop(),
-                      ),
-                      TextButton(
-                        child: const Text('OK'),
-                        onPressed: () {
-                          if (updatedValue1 != updatedValue2) {
-                            return displayErrorMessage(
-                              context,
-                              "Setting '$key' does not match",
-                            );
-                          }
-
-                          final result = validators.firstWhereOrNull(
-                            (validator) => !validator(updatedValue1),
-                          );
-                          if (result != null) {
-                            return displayErrorMessage(
-                              context,
-                              "Setting '$key' is not valid",
-                            );
-                          }
-
-                          setState(() => settings[key] = updatedValue1);
-                          Navigator.of(context).pop();
-                        },
-                      ),
-                    ],
-                    content: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Row(
-                          children: [
-                            Expanded(
-                              child: TextField(
-                                autofocus: true,
-                                controller: TextEditingController(
-                                  text: updatedValue1,
-                                ),
-                                obscureText: hidePassword1,
-                                obscuringCharacter: '*',
-                                onChanged: (value) => updatedValue1 = value,
-                              ),
-                            ),
-                            IconButton(
-                              onPressed:
-                                  () => setDialogState(
-                                    () => hidePassword1 = !hidePassword1,
-                                  ),
-                              icon: Icon(
-                                hidePassword1
-                                    ? Icons.visibility
-                                    : Icons.visibility_off,
-                              ),
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: constants.padding),
-                        Row(
-                          children: [
-                            Expanded(
-                              child: TextField(
-                                autofocus: false,
-                                controller: TextEditingController(
-                                  text: updatedValue2,
-                                ),
-                                obscureText: hidePassword2,
-                                obscuringCharacter: '*',
-                                onChanged: (value) => updatedValue2 = value,
-                              ),
-                            ),
-                            IconButton(
-                              onPressed:
-                                  () => setDialogState(
-                                    () => hidePassword2 = !hidePassword2,
-                                  ),
-                              icon: Icon(
-                                hidePassword2
-                                    ? Icons.visibility
-                                    : Icons.visibility_off,
-                              ),
-                            ),
-                          ],
-                        ),
-                      ],
-                    ),
-                    title: createSettingTitle(context, key, description),
-                  );
-                },
-              );
-            },
-          );
-        },
-      ),
-    );
-  }
-}
-
-Widget createSettingTitle(context, String key, String? description) {
-  if (description == null) {
-    return Text(key);
-  }
-
-  return Column(
-    mainAxisAlignment: MainAxisAlignment.start,
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.start,
-    children: [
-      Text(key, textAlign: TextAlign.start),
-      Text(
-        description,
-        style: Theme.of(context).textTheme.titleSmall,
-        textAlign: TextAlign.start,
-      ),
-    ],
-  );
-}
-
-void createStringListSetting(
-  context,
-  List<Widget> list,
-  Map<String, dynamic> settings,
-  String key,
-  value,
-  List<String> valueList,
-  IconData icon,
-  bool isAdvanced,
-  bool showAdvanced,
-  widget,
-  Function setState, {
-  String? description,
-}) {
-  if (!isAdvanced || widget.showAdvanced) {
-    list.add(
-      SettingsTile.navigation(
-        title: createSettingTitle(context, key, description),
-        leading: Icon(icon),
-        value: DropdownButton<String>(
-          value: value,
-          onChanged: (newValue) => setState(() => settings[key] = newValue),
-          items:
-              valueList.map<DropdownMenuItem<String>>((item) {
-                return DropdownMenuItem<String>(value: item, child: Text(item));
-              }).toList(),
-        ),
-      ),
-    );
-  }
-}
-
-void createStringSetting(
-  context,
-  List<Widget> list,
-  Map<String, dynamic> settings,
-  String key,
-  value,
-  IconData icon,
-  bool isAdvanced,
-  bool showAdvanced,
-  widget,
-  Function setState, {
-  String? description,
-  List<Validator> validators = const [],
-}) {
-  if (!isAdvanced || widget.showAdvanced) {
-    list.add(
-      SettingsTile.navigation(
-        leading: Icon(icon),
-        title: createSettingTitle(context, key, description),
-        value: Text(value),
-        onPressed: (_) {
-          String updatedValue = value;
-          showDialog(
-            context: context,
-            builder: (context) {
-              return AlertDialog(
-                actions: [
-                  TextButton(
-                    child: const Text('Cancel'),
-                    onPressed: () => Navigator.of(context).pop(),
-                  ),
-                  TextButton(
-                    child: const Text('OK'),
-                    onPressed: () {
-                      final result = validators.firstWhereOrNull(
-                        (validator) => !validator(updatedValue),
-                      );
-                      if (result != null) {
-                        return displayErrorMessage(
-                          context,
-                          "Setting '$key' is not valid",
-                        );
-                      }
-                      setState(() => settings[key] = updatedValue);
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                ],
-                content: TextField(
-                  autofocus: true,
-                  controller: TextEditingController(text: updatedValue),
-                  inputFormatters: [
-                    FilteringTextInputFormatter.deny(RegExp(r'\s')),
-                  ],
-                  onChanged: (value) => updatedValue = value,
-                ),
-                title: createSettingTitle(context, key, description),
-              );
-            },
-          );
-        },
-      ),
-    );
-  }
-}

web/repertory/lib/types/mount_config.dart

@@ -1,11 +1,11 @@
 import 'package:collection/collection.dart';
-import 'package:repertory/helpers.dart' show initialCaps;
+import 'package:flutter/material.dart';
 
 class MountConfig {
-  bool? mounted;
   final String _name;
-  String path = '';
+  String _path = '';
   Map<String, dynamic> _settings = {};
+  IconData _state = Icons.toggle_off;
   final String _type;
   MountConfig({required name, required type, Map<String, dynamic>? settings})
     : _name = name,
@@ -15,19 +15,23 @@ class MountConfig {
     }
   }
 
-  String? get bucket => _settings['${provider}Config']?["Bucket"] as String;
   String get name => _name;
-  String get provider => initialCaps(_type);
+  String get path => _path;
   UnmodifiableMapView<String, dynamic> get settings =>
       UnmodifiableMapView<String, dynamic>(_settings);
+  IconData get state => _state;
   String get type => _type;
 
+  factory MountConfig.fromJson(String type, String name) {
+    return MountConfig(name: name, type: type);
+  }
+
   void updateSettings(Map<String, dynamic> settings) {
     _settings = settings;
   }
 
   void updateStatus(Map<String, dynamic> status) {
-    path = status['Location'] as String;
+    _path = status['Location'] as String;
-    mounted = status['Active'] as bool;
+    _state = status['Active'] as bool ? Icons.toggle_on : Icons.toggle_off;
   }
 }

web/repertory/lib/widgets/mount_list_widget.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:repertory/constants.dart' as constants;
+import 'package:repertory/models/mount.dart';
 import 'package:repertory/models/mount_list.dart';
 import 'package:repertory/widgets/mount_widget.dart';
 
@@ -14,17 +14,8 @@ class MountListWidget extends StatelessWidget {
         return ListView.builder(
           itemBuilder: (context, idx) {
             return ChangeNotifierProvider(
-              create: (context) => mountList.items[idx],
+              create: (context) => Mount(mountList.items[idx]),
-              key: ValueKey(mountList.items[idx].id),
+              child: const MountWidget(),
-              child: Padding(
-                padding: EdgeInsets.only(
-                  bottom:
-                      idx == mountList.items.length - 1
-                          ? 0.0
-                          : constants.padding,
-                ),
-                child: const MountWidget(),
-              ),
             );
           },
           itemCount: mountList.items.length,

web/repertory/lib/widgets/mount_widget.dart

@@ -1,10 +1,7 @@
 import 'dart:async';
 
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import 'package:repertory/constants.dart' as constants;
 import 'package:repertory/helpers.dart';
 import 'package:repertory/models/mount.dart';
 
@@ -16,22 +13,21 @@ class MountWidget extends StatefulWidget {
 }
 
 class _MountWidgetState extends State<MountWidget> {
-  bool _enabled = true;
-  bool _editEnabled = true;
   Timer? _timer;
+  bool _enabled = true;
 
   @override
   Widget build(BuildContext context) {
     return Card(
-      margin: const EdgeInsets.all(0.0),
       child: Consumer<Mount>(
-        builder: (context, Mount mount, _) {
+        builder: (context, mount, _) {
           final textColor = Theme.of(context).colorScheme.onSurface;
           final subTextColor =
               Theme.of(context).brightness == Brightness.dark
                   ? Colors.white38
                   : Colors.black87;
 
+          final isActive = mount.state == Icons.toggle_on;
           final nameText = SelectableText(
             formatMountName(mount.type, mount.name),
             style: TextStyle(color: subTextColor),
@@ -49,66 +45,48 @@ class _MountWidgetState extends State<MountWidget> {
               children: [
                 nameText,
                 SelectableText(
-                  mount.path.isEmpty && mount.mounted == null
+                  mount.path,
-                      ? 'loading...'
-                      : mount.path.isEmpty
-                      ? '<mount location not set>'
-                      : mount.path,
                   style: TextStyle(color: subTextColor),
                 ),
               ],
             ),
             title: SelectableText(
-              mount.provider,
+              initialCaps(mount.type),
               style: TextStyle(color: textColor, fontWeight: FontWeight.bold),
             ),
-            trailing: Row(
+            trailing: IconButton(
-              mainAxisAlignment: MainAxisAlignment.end,
+              icon: Icon(
-              mainAxisSize: MainAxisSize.min,
+                mount.state,
-              crossAxisAlignment: CrossAxisAlignment.start,
+                color:
-              children: [
+                    isActive ? Color.fromARGB(255, 163, 96, 76) : subTextColor,
-                if (mount.mounted != null && !mount.mounted!)
+              ),
-                  IconButton(
+              onPressed:
-                    icon: const Icon(Icons.edit),
+                  _enabled
-                    color: subTextColor,
+                      ? () async {
-                    tooltip: 'Edit mount location',
+                        setState(() {
-                    onPressed: () async {
+                          _enabled = false;
-                      setState(() => _editEnabled = false);
+                        });
-                      final available = await mount.getAvailableLocations();
+
-                      if (context.mounted) {
+                        String? location = mount.path;
-                        final location = await editMountLocation(
+                        if (!isActive && mount.path.isEmpty) {
-                          context,
+                          location = await mount.getMountLocation();
-                          available,
+                          if (location == null) {}
-                          location: mount.path,
-                        );
-                        if (location != null) {
-                          await mount.setMountLocation(location);
                         }
+
+                        mount
+                            .mount(isActive, location: location)
+                            .then((_) {
+                              setState(() {
+                                _enabled = true;
+                              });
+                            })
+                            .catchError((_) {
+                              setState(() {
+                                _enabled = true;
+                              });
+                            });
                       }
-                      setState(() => _editEnabled = true);
+                      : null,
-                    },
-                  ),
-                IconButton(
-                  icon: Icon(
-                    mount.mounted == null
-                        ? Icons.hourglass_top
-                        : mount.mounted!
-                        ? Icons.toggle_on
-                        : Icons.toggle_off,
-                    color:
-                        mount.mounted ?? false
-                            ? Color.fromARGB(255, 163, 96, 76)
-                            : subTextColor,
-                  ),
-                  tooltip:
-                      mount.mounted == null
-                          ? ''
-                          : mount.mounted!
-                          ? 'Unmount'
-                          : 'Mount',
-                  onPressed: _createMountHandler(context, mount),
-                ),
-              ],
             ),
           );
         },
@@ -116,49 +94,6 @@ class _MountWidgetState extends State<MountWidget> {
     );
   }
 
-  VoidCallback? _createMountHandler(context, Mount mount) {
-    return _enabled && mount.mounted != null
-        ? () async {
-          if (mount.mounted == null) {
-            return;
-          }
-
-          final mounted = mount.mounted!;
-
-          setState(() {
-            _enabled = false;
-          });
-
-          final location = await _getMountLocation(context, mount);
-
-          cleanup() {
-            setState(() {
-              _enabled = true;
-            });
-          }
-
-          if (!mounted && location == null) {
-            displayErrorMessage(context, "Mount location is not set");
-            return cleanup();
-          }
-
-          final success = await mount.mount(mounted, location: location);
-          if (success ||
-              mounted ||
-              constants.navigatorKey.currentContext == null ||
-              !constants.navigatorKey.currentContext!.mounted) {
-            return cleanup();
-          }
-
-          displayErrorMessage(
-            context,
-            "Mount location is not available: $location",
-          );
-          cleanup();
-        }
-        : null;
-  }
-
   @override
   void dispose() {
     _timer?.cancel();
@@ -166,27 +101,6 @@ class _MountWidgetState extends State<MountWidget> {
     super.dispose();
   }
 
-  Future<String?> _getMountLocation(context, Mount mount) async {
-    if (mount.mounted ?? false) {
-      return null;
-    }
-
-    if (mount.path.isNotEmpty) {
-      return mount.path;
-    }
-
-    String? location = await mount.getMountLocation();
-    if (location != null) {
-      return location;
-    }
-
-    if (!context.mounted) {
-      return location;
-    }
-
-    return editMountLocation(context, await mount.getAvailableLocations());
-  }
-
   @override
   void initState() {
     super.initState();

web/repertory/lib/widgets/ui_settings.dart

@@ -1,155 +0,0 @@
-import 'dart:convert' show jsonEncode;
-
-import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-import 'package:provider/provider.dart';
-import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/helpers.dart'
-    show
-        convertAllToString,
-        displayAuthError,
-        getBaseUri,
-        getChanged,
-        getSettingDescription,
-        getSettingValidators,
-        trimNotEmptyValidator;
-import 'package:repertory/models/auth.dart';
-import 'package:repertory/settings.dart';
-import 'package:settings_ui/settings_ui.dart';
-
-class UISettingsWidget extends StatefulWidget {
-  final bool showAdvanced;
-  final Map<String, dynamic> settings;
-  final Map<String, dynamic> origSettings;
-  const UISettingsWidget({
-    super.key,
-    required this.origSettings,
-    required this.settings,
-    required this.showAdvanced,
-  });
-
-  @override
-  State<UISettingsWidget> createState() => _UISettingsWidgetState();
-}
-
-class _UISettingsWidgetState extends State<UISettingsWidget> {
-  @override
-  Widget build(BuildContext context) {
-    List<SettingsTile> commonSettings = [];
-
-    widget.settings.forEach((key, value) {
-      switch (key) {
-        case 'ApiPassword':
-          {
-            createPasswordSetting(
-              context,
-              commonSettings,
-              widget.settings,
-              key,
-              value,
-              false,
-              widget.showAdvanced,
-              widget,
-              setState,
-              description: getSettingDescription(key),
-              validators: getSettingValidators(key),
-            );
-          }
-          break;
-        case 'ApiPort':
-          {
-            createIntSetting(
-              context,
-              commonSettings,
-              widget.settings,
-              key,
-              value,
-              false,
-              widget.showAdvanced,
-              widget,
-              setState,
-              description: getSettingDescription(key),
-              validators: getSettingValidators(key),
-            );
-          }
-          break;
-        case 'ApiUser':
-          {
-            createStringSetting(
-              context,
-              commonSettings,
-              widget.settings,
-              key,
-              value,
-              Icons.person,
-              false,
-              widget.showAdvanced,
-              widget,
-              setState,
-              description: getSettingDescription(key),
-              validators: [...getSettingValidators(key), trimNotEmptyValidator],
-            );
-          }
-          break;
-      }
-    });
-
-    return SettingsList(
-      shrinkWrap: false,
-      sections: [
-        SettingsSection(title: const Text('Settings'), tiles: commonSettings),
-      ],
-    );
-  }
-
-  @override
-  void dispose() {
-    final settings = getChanged(widget.origSettings, widget.settings);
-    if (settings.isNotEmpty) {
-      final key =
-          Provider.of<Auth>(
-            constants.navigatorKey.currentContext!,
-            listen: false,
-          ).key;
-      convertAllToString(settings, key)
-          .then((map) async {
-            try {
-              final authProvider = Provider.of<Auth>(
-                constants.navigatorKey.currentContext!,
-                listen: false,
-              );
-
-              final auth = await authProvider.createAuth();
-              final response = await http.put(
-                Uri.parse(
-                  Uri.encodeFull(
-                    '${getBaseUri()}/api/v1/settings?auth=$auth&data=${jsonEncode(map)}',
-                  ),
-                ),
-              );
-
-              if (response.statusCode == 401) {
-                displayAuthError(authProvider);
-                authProvider.logoff();
-              }
-            } catch (e) {
-              debugPrint('$e');
-            }
-          })
-          .catchError((e) {
-            debugPrint('$e');
-          });
-    }
-
-    super.dispose();
-  }
-
-  @override
-  void setState(VoidCallback fn) {
-    if (!mounted) {
-      return;
-    }
-
-    super.setState(fn);
-  }
-}

web/repertory/pubspec.yaml

@@ -38,8 +38,6 @@ dependencies:
   http: ^1.3.0
   provider: ^6.1.2
   settings_ui: ^2.0.2
-  sodium_libs: ^3.4.4+1
-  convert: ^3.1.2
 
 dev_dependencies:
   flutter_test:

web/repertory/web/index.html

@@ -1,44 +1,38 @@
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
-    <!--
+  <!--
-      If you are serving your web app in a path other than the root, change the
+    If you are serving your web app in a path other than the root, change the
-      href value below to reflect the base path you are serving from.
+    href value below to reflect the base path you are serving from.
 
-      The path provided below has to start and end with a slash "/" in order for
+    The path provided below has to start and end with a slash "/" in order for
-      it to work correctly.
+    it to work correctly.
 
-      For more details:
+    For more details:
-      * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
 
-      This is a placeholder for base href that will be replaced by the value of
+    This is a placeholder for base href that will be replaced by the value of
-      the `--base-href` argument provided to `flutter build`.
+    the `--base-href` argument provided to `flutter build`.
-    -->
+  -->
-    <base href="$FLUTTER_BASE_HREF">
+  <base href="$FLUTTER_BASE_HREF">
 
-    <meta charset="UTF-8">
+  <meta charset="UTF-8">
-    <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-    <meta name="description" content="A new Flutter project.">
+  <meta name="description" content="A new Flutter project.">
 
-    <!-- iOS meta tags & icons -->
+  <!-- iOS meta tags & icons -->
-    <meta name="mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-title" content="repertory">
+  <meta name="apple-mobile-web-app-title" content="repertory">
-    <link rel="apple-touch-icon" href="icons/Icon-192.png">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
-    <!-- Favicon -->
+  <!-- Favicon -->
-    <link rel="icon" type="image/png" href="favicon.png">
+  <link rel="icon" type="image/png" href="favicon.png"/>
 
-    <title>repertory</title>
+  <title>repertory</title>
-    <link rel="manifest" href="manifest.json">
+  <link rel="manifest" href="manifest.json">
-    <script type="text/javascript" src="sodium.js" async="true"></script>
+</head>
-  </head>
+<body>
-  <body>
+  <script src="flutter_bootstrap.js" async></script>
-    <script>
+</body>
-      window.flutterConfiguration = {
-          canvasKitBaseUrl: "/canvaskit/"
-      };
-    </script>
-    <script src="flutter_bootstrap.js" async=""></script>
-  </body>
 </html>