refactor

Reviewed-on: #40

.cspell/words.txt

@@ -115,7 +115,6 @@ googletest
 gpath
 gtest_version
 has_setxattr
-hkey
 httpapi
 httplib
 icudata
@@ -145,7 +144,6 @@ libuuid_include_dirs
 libvlc
 linkflags
 localappdata
-lpbyte
 lptr
 lpwstr
 markdownlint

CHANGELOG.md

@@ -4,14 +4,15 @@
 
 ### 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
+* Prevent overlapping `repertory` `ApiPort`'s
-* 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

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,44 +30,40 @@ 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};
 
 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 wait_for_lock(int fd,
-                                          std::uint8_t retry_count = 30U)
+                                          std::uint8_t retry_count = 30u)
       -> 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, int pid)
       -> bool;
 };
 
@@ -83,5 +79,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/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,52 @@
 #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()
+    : pt_(provider_type::sia), unique_id_(""), mutex_id_(""), lock_fd_(-1) {}
+
 lock_data::~lock_data() { release(); }
 
-auto lock_data::get_lock_data_file() const -> std::string {
+auto lock_data::get_lock_data_file() -> std::string {
-  auto dir = get_state_directory();
+  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, {
+      dir, {"mountstate_" + std::to_string(getuid()) + ".json"});
-               fmt::format("{}_{}.json", mutex_id_, getuid()),
-           });
 }
 
-auto lock_data::get_lock_file() const -> std::string {
+auto lock_data::get_lock_file() -> std::string {
-  auto dir = get_state_directory();
+  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("{}_{}.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},
-    };
-
-    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()) {
+      flock(fd, LOCK_UN);
-      mount_state = {
-          {"Active", false},
-          {"Location", ""},
-          {"PID", -1},
-      };
-    }
-    flock(handle, LOCK_UN);
     }
 
-  close(handle);
+    close(fd);
+  }
   return ret;
 }
 
@@ -101,20 +89,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;
@@ -124,53 +117,55 @@ auto lock_data::grab_lock(std::uint8_t retry_count) -> lock_result {
 }
 
 void lock_data::release() {
-  if (handle_ == -1) {
+  if (lock_fd_ == -1) {
     return;
   }
 
   if (lock_status_ == 0) {
-    [[maybe_unused]] auto success{utils::file::file{get_lock_file()}.remove()};
+    unlink(get_lock_file().c_str());
-    flock(handle_, LOCK_UN);
+    flock(lock_fd_, LOCK_UN);
   }
 
-  close(handle_);
+  close(lock_fd_);
-  handle_ = -1;
+  lock_fd_ = -1;
 }
 
-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,
                                 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;
-  }
-
-  auto ret{false};
     if (wait_for_lock(handle) == 0) {
+      const auto mount_id =
+          app_config::get_provider_display_name(pt_) + unique_id_;
       json mount_state;
       if (not utils::file::read_json_file(get_lock_data_file(), mount_state)) {
         utils::error::raise_error(function_name,
                                   "failed to read mount state file|sp|" +
                                       get_lock_file());
       }
-    if ((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") ==
-        (active &&
+           mount_state[mount_id].end()) ||
-         ((mount_state.find("Location") == mount_state.end()) ||
+          (mount_state[mount_id]["Active"].get<bool>() != active) ||
-          (mount_state["Location"].get<std::string>() != mount_location)))) {
+          (active && ((mount_state[mount_id].find("Location") ==
-      if (mount_location.empty() && not active) {
+                       mount_state[mount_id].end()) ||
-        ret = utils::file::file{get_lock_data_file()}.remove();
+                      (mount_state[mount_id]["Location"].get<std::string>() !=
-      } else {
+                       mount_location)))) {
-        ret = utils::file::write_json_file(
+        const auto lines = utils::file::read_file_lines(get_lock_data_file());
-            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;
       }
@@ -179,16 +174,17 @@ auto lock_data::set_mount_state(bool active, std::string_view mount_location,
     }
 
     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 +233,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;
       }
-
+    }
-  mount_state = mount_state.empty() ? json({
+    ::RegCloseKey(key);
-                                          {"Active", false},
+  }
-                                          {"Location", ""},
+  return ret;
-                                          {"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;
-  for (std::uint8_t idx = 0U;
+         (i <= retry_count) && ((mutex_state_ = ::WaitForSingleObject(
-       (idx <= retry_count) &&
+                                     mutex_handle_, 100)) == WAIT_TIMEOUT);
-       ((mutex_state_ = ::WaitForSingleObject(mutex_handle_, max_sleep)) ==
+         i++) {
-        WAIT_TIMEOUT);
-       ++idx) {
     }
 
     switch (mutex_state_) {
-  case WAIT_OBJECT_0:
+    case WAIT_OBJECT_0: {
-    return lock_result::success;
+      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:
-    return lock_result::locked;
+      ret = lock_result::locked;
+      break;
 
     default:
-    return lock_result::failure;
+      ret = lock_result::failure;
+      break;
     }
+  }
+
+  return ret;
 }
 
 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)) {
-    if (mutex_state_ == WAIT_OBJECT_0) {
-      [[maybe_unused]] auto success{set_mount_state(false, "", -1)};
-    }
-
       ::ReleaseMutex(mutex_handle_);
     }
-
     ::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;
-  [[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,
-                        fmt::format(R"(SOFTWARE\{}\Mounts\{})",
-                                    REPERTORY_DATA_NAME, mutex_id_)
-                            .c_str(),
-                        0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key,
-                        nullptr) != ERROR_SUCCESS) {
-    return false;
-  }
-
-  auto ret{false};
-  if (mount_location.empty() && not active) {
-    ::RegCloseKey(key);
-
-    if (::RegCreateKeyExA(
                HKEY_CURRENT_USER,
-            fmt::format(R"(SOFTWARE\{}\Mounts)", REPERTORY_DATA_NAME).c_str(),
+               ("SOFTWARE\\" + std::string{REPERTORY_DATA_NAME} + "\\Mounts")
-            0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key,
+                   .c_str(),
-            nullptr) != ERROR_SUCCESS) {
+               0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key, nullptr))) {
-      return false;
+        const auto str = json({{"Active", active},
-    }
-
-    ret = (::RegDeleteKeyA(key, mutex_id_.c_str()) == ERROR_SUCCESS);
-  } else {
-    auto data{
-        json({
-                 {"Active", active},
                                {"Location", active ? mount_location : ""},
-                 {"PID", active ? pid : -1},
+                               {"PID", active ? pid : -1}})
-             })
+                             .dump(0);
-            .dump(),
+        ret = !::RegSetValueEx(key, &mount_id[0], 0, REG_SZ,
-    };
+                               reinterpret_cast<const BYTE *>(&str[0]),
-    ret = (::RegSetValueEx(key, nullptr, 0, REG_SZ,
+                               static_cast<DWORD>(str.size()));
-                           reinterpret_cast<const BYTE *>(data.c_str()),
+        ::RegCloseKey(key);
-                           static_cast<DWORD>(data.size())) == ERROR_SUCCESS);
+      }
+    } else {
+      ret = true;
+    }
   }
 
-  ::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) {}
@@ -142,17 +144,13 @@ void server::start() {
   initialize(*server_);
 
   server_thread_ = std::make_unique<std::thread>([this]() {
+#ifdef _WIN32
     server_->set_socket_options([](auto &&sock) {
-#if defined(_WIN32)
+      int enable = 1;
-      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)
     });
+#endif //  _WIN32
 
     server_->listen("127.0.0.1", config_.get_api_port());
   });

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,13 @@
 #include "providers/provider.hpp"
 #include "types/repertory.hpp"
 #include "utils/cli_utils.hpp"
+#include "utils/com_init_wrapper.hpp"
 #include "utils/file.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,15 +56,6 @@ 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 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();
   if (lock_result == lock_result::locked) {
@@ -106,6 +97,13 @@ mount(std::vector<const char *> args, std::string data_directory,
   }
 #endif // defined(_WIN32)
 
+  lock_data global_lock(provider_type::unknown, "global");
+  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;
+  }
+
   auto drive_args = utils::cli::parse_drive_options(args, prov, data_directory);
   app_config config(prov, data_directory);
   {

repertory/repertory/include/ui/handlers.hpp

@@ -74,7 +74,7 @@ private:
   [[nodiscard]] auto data_directory_exists(provider_type prov,
                                            std::string_view name) const -> bool;
 
-  static void handle_get_available_locations(httplib::Response &res);
+  void handle_get_available_locations(httplib::Response &res) const;
 
   void handle_get_mount(const httplib::Request &req,
                         httplib::Response &res) const;
@@ -96,9 +96,6 @@ private:
 
   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;
 

repertory/repertory/src/ui/handlers.cpp

@@ -109,17 +109,13 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
       server_(server) {
   REPERTORY_USES_FUNCTION_NAME();
 
+#ifdef _WIN32
   server_->set_socket_options([](auto &&sock) {
-#if defined(_WIN32)
+    int enable = 1;
-    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)
   });
+#endif //  _WIN32
 
   server_->set_pre_routing_handler(
       [this](const httplib::Request &req,
@@ -172,7 +168,7 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
                      : http_error_codes::internal_error;
   });
 
-  server->Get("/api/v1/locations", [](auto && /* req */, auto &&res) {
+  server->Get("/api/v1/locations", [this](auto && /* req */, auto &&res) {
     handle_get_available_locations(res);
   });
 
@@ -205,10 +201,6 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
   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);
   });
@@ -306,24 +298,7 @@ auto handlers::data_directory_exists(provider_type prov,
   return ret;
 }
 
-void handlers::handle_put_mount_location(const httplib::Request &req,
+void handlers::handle_get_available_locations(httplib::Response &res) const {
-                                         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)) {
-    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:",
@@ -432,6 +407,8 @@ void handlers::handle_get_mount_location(const httplib::Request &req,
 
 void handlers::handle_get_mount_status(const httplib::Request &req,
                                        httplib::Response &res) const {
+  REPERTORY_USES_FUNCTION_NAME();
+
   auto name = req.get_param_value("name");
   auto prov = provider_type_from_string(req.get_param_value("type"));
 
@@ -440,9 +417,34 @@ void handlers::handle_get_mount_status(const httplib::Request &req,
     return;
   }
 
+  auto status_name = app_config::get_provider_display_name(prov);
+
+  switch (prov) {
+  case provider_type::remote: {
+    auto parts = utils::string::split(name, '_', false);
+    status_name =
+        fmt::format("{}{}:{}", status_name, parts.at(0U), parts.at(1U));
+  } break;
+
+  case provider_type::encrypt:
+  case provider_type::sia:
+  case provider_type::s3:
+    status_name = fmt::format("{}{}", status_name, name);
+    break;
+
+  default:
+    throw utils::error::create_exception(function_name,
+                                         {
+                                             "provider is not supported",
+                                             provider_type_to_string(prov),
+                                             name,
+                                         });
+  }
+
   auto lines = launch_process(prov, name, {"-status"});
 
-  auto result = nlohmann::json::parse(utils::string::join(lines, '\n'));
+  nlohmann::json result(
+      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>()) {
@@ -488,14 +490,14 @@ void handlers::handle_post_add_mount(const httplib::Request &req,
   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 subKey = fmt::format("{}.{}", key, key2);
         auto skip{false};
         auto decrypted = decrypt_value(
-            config_, sub_key, value2.template get<std::string>(), skip);
+            config_, subKey, value2.template get<std::string>(), skip);
         if (skip) {
           continue;
         }
-        values[sub_key] = decrypted;
+        values[subKey] = decrypted;
       }
 
       continue;
@@ -544,12 +546,12 @@ void handlers::handle_post_mount(const httplib::Request &req,
       return;
     }
 
-    config_->set_mount_location(prov, name, location);
-
     static std::mutex mount_mtx;
     mutex_lock lock(mount_mtx);
 
     launch_process(prov, name, {location}, true);
+    config_->set_mount_location(prov, name, location);
+
     launch_process(prov, name, {"-status"});
   }
 
@@ -580,7 +582,7 @@ void handlers::handle_put_set_value_by_name(const httplib::Request &req,
 
 void handlers::handle_put_settings(const httplib::Request &req,
                                    httplib::Response &res) const {
-  auto data = nlohmann::json::parse(req.get_param_value("data"));
+  nlohmann::json 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>(),
@@ -659,8 +661,10 @@ auto handlers::launch_process(provider_type prov, std::string_view name,
     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)
+#elif defined(__linux__) // defined(__linux__)
     args.insert(args.begin(), repertory_binary_);
+#else                    // !defined(__linux__) && !defined(_WIN32)
+    build fails here
 #endif                   // defined(_WIN32)
 
     std::vector<const char *> exec_args;
@@ -673,9 +677,16 @@ auto handlers::launch_process(provider_type prov, std::string_view name,
 #if defined(_WIN32)
     _spawnv(_P_DETACH, exec_args.at(0U),
             const_cast<char *const *>(exec_args.data()));
-#else  // !defined(_WIN32)
+#elif defined(__linux__) // defined(__linux__)
     auto pid = fork();
-    if (pid == 0) {
+    if (pid < 0) {
+      throw utils::error::create_exception(function_name, {"mount failed"});
+    }
+
+    if (pid != 0) {
+      return {};
+    }
+
     setsid();
     chdir("/");
     close(STDIN_FILENO);
@@ -685,10 +696,10 @@ auto handlers::launch_process(provider_type prov, std::string_view name,
     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);
-    }
+    execvp(exec_args.at(0U), const_cast<char *const *>(exec_args.data()));
+#else                    // !defined(__linux__) && !defined(_WIN32)
+    build fails here
 #endif                   // defined(_WIN32)
     return {};
   }

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

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];
@@ -157,7 +157,7 @@ auto get_next_available_port(std::uint16_t first_port,
         ++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) {

web/repertory/lib/helpers.dart

@@ -3,8 +3,7 @@ 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';
-import 'package:sodium_libs/sodium_libs.dart' show SecureKey, StringX;
 
 typedef Validator = bool Function(String);
 
@@ -107,31 +106,25 @@ Map<String, dynamic> createDefaultSettings(String mountType) {
   return {};
 }
 
-void displayAuthError(Auth auth) {
+void displayAuthError() {
-  if (!auth.authenticated || constants.navigatorKey.currentContext == null) {
+  if (constants.navigatorKey.currentContext == null) {
     return;
   }
 
   displayErrorMessage(
     constants.navigatorKey.currentContext!,
     "Authentication failed",
-    clear: true,
   );
 }
 
-void displayErrorMessage(context, String text, {bool clear = false}) {
+void displayErrorMessage(context, String text) {
   if (!context.mounted) {
     return;
   }
 
-  final messenger = ScaffoldMessenger.of(context);
+  ScaffoldMessenger.of(
-  if (clear) {
+    context,
-    messenger.removeCurrentSnackBar();
+  ).showSnackBar(SnackBar(content: Text(text, textAlign: TextAlign.center)));
-  }
-
-  messenger.showSnackBar(
-    SnackBar(content: Text(text, textAlign: TextAlign.center)),
-  );
 }
 
 String formatMountName(String type, String name) {
@@ -336,67 +329,3 @@ Map<String, dynamic> getChanged(
 
   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/models/auth.dart

@@ -54,11 +54,9 @@ class Auth with ChangeNotifier {
 
   void logoff() {
     _authenticated = false;
-    _key = SecureKey.random(constants.sodium, 32);
     _user = "";
+    mountList?.clear();
 
     notifyListeners();
-
-    mountList?.clear();
   }
 }

web/repertory/lib/models/mount.dart

@@ -101,35 +101,6 @@ class Mount with ChangeNotifier {
     }
   }
 
-  Future<void> setMountLocation(String location) async {
-    try {
-      mountConfig.path = location;
-
-      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',
-          ),
-        ),
-      );
-
-      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 {
     try {
       final auth = await _auth.createAuth();
@@ -207,7 +178,7 @@ class Mount with ChangeNotifier {
       );
 
       if (response.statusCode == 401) {
-        displayAuthError(_auth);
+        displayAuthError();
         _auth.logoff();
         return false;
       }

web/repertory/lib/models/mount_list.dart

@@ -63,7 +63,7 @@ class MountList with ChangeNotifier {
       );
 
       if (response.statusCode == 401) {
-        displayAuthError(_auth);
+        displayAuthError();
         _auth.logoff();
         return;
       }
@@ -155,7 +155,7 @@ class MountList with ChangeNotifier {
           ret = true;
           break;
         case 401:
-          displayAuthError(_auth);
+          displayAuthError();
           _auth.logoff();
           break;
         case 404:

web/repertory/lib/screens/auth_screen.dart

@@ -38,19 +38,6 @@ class _AuthScreenState extends State<AuthScreen> {
             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(
@@ -72,26 +59,26 @@ class _AuthScreenState extends State<AuthScreen> {
                         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(),
+                        onPressed:
+                            _enabled
+                                ? () async {
+                                  setState(() => _enabled = false);
+                                  await auth.authenticate(
+                                    _userController.text,
+                                    _passwordController.text,
+                                  );
+                                  setState(() => _enabled = true);
+                                }
+                                : null,
                         child: const Text('Login'),
                       ),
                     ],

web/repertory/lib/widgets/mount_widget.dart

@@ -17,7 +17,6 @@ class MountWidget extends StatefulWidget {
 
 class _MountWidgetState extends State<MountWidget> {
   bool _enabled = true;
-  bool _editEnabled = true;
   Timer? _timer;
 
   @override
@@ -62,33 +61,7 @@ class _MountWidgetState extends State<MountWidget> {
               mount.provider,
               style: TextStyle(color: textColor, fontWeight: FontWeight.bold),
             ),
-            trailing: Row(
+            trailing: IconButton(
-              mainAxisAlignment: MainAxisAlignment.end,
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (mount.mounted != null && !mount.mounted!)
-                  IconButton(
-                    icon: const Icon(Icons.edit),
-                    color: subTextColor,
-                    tooltip: 'Edit mount location',
-                    onPressed: () async {
-                      setState(() => _editEnabled = false);
-                      final available = await mount.getAvailableLocations();
-                      if (context.mounted) {
-                        final location = await editMountLocation(
-                          context,
-                          available,
-                          location: mount.path,
-                        );
-                        if (location != null) {
-                          await mount.setMountLocation(location);
-                        }
-                      }
-                      setState(() => _editEnabled = true);
-                    },
-                  ),
-                IconButton(
               icon: Icon(
                 mount.mounted == null
                     ? Icons.hourglass_top
@@ -100,16 +73,8 @@ class _MountWidgetState extends State<MountWidget> {
                         ? Color.fromARGB(255, 163, 96, 76)
                         : subTextColor,
               ),
-                  tooltip:
-                      mount.mounted == null
-                          ? ''
-                          : mount.mounted!
-                          ? 'Unmount'
-                          : 'Mount',
               onPressed: _createMountHandler(context, mount),
             ),
-              ],
-            ),
           );
         },
       ),
@@ -184,7 +149,70 @@ class _MountWidgetState extends State<MountWidget> {
       return location;
     }
 
-    return editMountLocation(context, await mount.getAvailableLocations());
+    final available = await mount.getAvailableLocations();
+
+    String? 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: TextEditingController(
+                          text: currentLocation,
+                        ),
+                        inputFormatters: [
+                          FilteringTextInputFormatter.deny(RegExp(r'\s')),
+                        ],
+                        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('Set Mount Location'),
+            );
+          },
+        );
+      },
+    );
   }
 
   @override

web/repertory/lib/widgets/ui_settings.dart

@@ -106,6 +106,7 @@ class _UISettingsWidgetState extends State<UISettingsWidget> {
   void dispose() {
     final settings = getChanged(widget.origSettings, widget.settings);
     if (settings.isNotEmpty) {
+      debugPrint("start");
       final key =
           Provider.of<Auth>(
             constants.navigatorKey.currentContext!,
@@ -113,13 +114,15 @@ class _UISettingsWidgetState extends State<UISettingsWidget> {
           ).key;
       convertAllToString(settings, key)
           .then((map) async {
+            debugPrint("map");
             try {
               final authProvider = Provider.of<Auth>(
                 constants.navigatorKey.currentContext!,
                 listen: false,
               );
-
               final auth = await authProvider.createAuth();
+
+              debugPrint("auth");
               final response = await http.put(
                 Uri.parse(
                   Uri.encodeFull(
@@ -129,7 +132,7 @@ class _UISettingsWidgetState extends State<UISettingsWidget> {
               );
 
               if (response.statusCode == 401) {
-                displayAuthError(authProvider);
+                displayAuthError();
                 authProvider.logoff();
               }
             } catch (e) {