v2.0.5-rc (#41 )

Reviewed-on: #41
2025-03-26 07:02:38 -05:00
33 changed files with 972 additions and 605 deletions
--- a/.cspell/words.txt
+++ b/.cspell/words.txt
@@ -115,6 +115,7 @@ googletest
 gpath
 gtest_version
 has_setxattr
+hkey
 httpapi
 httplib
 icudata
@@ -144,6 +145,7 @@ libuuid_include_dirs
 libvlc
 linkflags
 localappdata
+lpbyte
 lptr
 lpwstr
 markdownlint
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +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
--- a/repertory/librepertory/include/app_config.hpp
+++ b/repertory/librepertory/include/app_config.hpp
@@ -43,8 +43,7 @@ public:
  [[nodiscard]] static auto default_remote_api_port(const provider_type &prov)
      -> std::uint16_t;

-  [[nodiscard]] static auto default_rpc_port(const provider_type &prov)
-      -> std::uint16_t;
+  [[nodiscard]] static auto default_rpc_port() -> std::uint16_t;

  [[nodiscard]] static auto get_provider_display_name(const provider_type &prov)
      -> std::string;
--- a/repertory/librepertory/include/platform/platform.hpp
+++ b/repertory/librepertory/include/platform/platform.hpp
@@ -22,6 +22,13 @@
 #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"
--- a/repertory/librepertory/include/platform/unix_platform.hpp
+++ b/repertory/librepertory/include/platform/unix_platform.hpp
@@ -30,38 +30,45 @@ class i_provider;

 class lock_data final {
 public:
-  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/);
+  lock_data(provider_type prov, std::string_view unique_id);

-  lock_data();
+  lock_data(const lock_data &) = delete;
+  lock_data(lock_data &&) = delete;
+
+  auto operator=(const lock_data &) -> lock_data & = delete;
+  auto operator=(lock_data &&) -> lock_data & = delete;

  ~lock_data();

 private:
-  const provider_type pt_;
-  const std::string unique_id_;
-  const std::string mutex_id_;
-  int lock_fd_;
-  int lock_status_ = EWOULDBLOCK;
+  std::string mutex_id_;
+
+private:
+  int handle_{};
+  int lock_status_{EWOULDBLOCK};

 private:
  [[nodiscard]] static auto get_state_directory() -> std::string;

-  [[nodiscard]] static auto get_lock_data_file() -> std::string;
+  [[nodiscard]] auto get_lock_data_file() const -> std::string;

-  [[nodiscard]] auto get_lock_file() -> std::string;
+  [[nodiscard]] auto get_lock_file() const -> std::string;

 private:
-  [[nodiscard]] static auto
-  wait_for_lock(int fd, std::uint8_t retry_count = 30u) -> int;
+  [[nodiscard]] static auto wait_for_lock(int handle,
+                                          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,
-                                     const std::string &mount_location,
-                                     int pid) -> bool;
+                                     std::string_view mount_location, int pid)
+      -> bool;
 };

 [[nodiscard]] auto create_meta_attributes(
@@ -76,5 +83,5 @@ public:
                                         const api_file &file) -> api_error;
 } // namespace repertory

-#endif // _WIN32
+#endif // !defined(_WIN32)
 #endif // REPERTORY_INCLUDE_PLATFORM_UNIXPLATFORM_HPP_
--- a/repertory/librepertory/include/platform/win32_platform.hpp
+++ b/repertory/librepertory/include/platform/win32_platform.hpp
@@ -23,7 +23,6 @@
 #define REPERTORY_INCLUDE_PLATFORM_WINPLATFORM_HPP_
 #if defined(_WIN32)

-#include "app_config.hpp"
 #include "types/repertory.hpp"

 namespace repertory {
@@ -31,43 +30,32 @@ class i_provider;

 class lock_data final {
 public:
-  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
-      : pt_(pt),
-        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])) {}
+  explicit lock_data(provider_type prov, std::string unique_id);
+  lock_data(const lock_data &) = delete;
+  lock_data(lock_data &&) = delete;

-  lock_data()
-      : pt_(provider_type::sia),
-        unique_id_(""),
-        mutex_id_(""),
-        mutex_handle_(INVALID_HANDLE_VALUE) {}
+  ~lock_data();

-  ~lock_data() { release(); }
+  auto operator=(const lock_data &) -> lock_data & = delete;
+  auto operator=(lock_data &&) -> lock_data & = delete;

 private:
-  const provider_type pt_;
-  const std::string unique_id_;
-  const std::string mutex_id_;
-  HANDLE mutex_handle_;
-  DWORD mutex_state_ = WAIT_FAILED;
+  std::string mutex_id_;
+  HANDLE mutex_handle_{INVALID_HANDLE_VALUE};
+  DWORD mutex_state_{WAIT_FAILED};
+
+  [[nodiscard]] auto get_current_mount_state(json &mount_state) -> bool;

 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 get_unique_id() const -> std::string { return unique_id_; }
-
-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30) -> lock_result;
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;

  void release();

  [[nodiscard]] auto set_mount_state(bool active,
-                                     const std::string &mount_location,
-                                     const std::int64_t &pid) -> bool;
+                                     std::string_view mount_location,
+                                     std::int64_t pid) -> bool;
 };

 [[nodiscard]] auto create_meta_attributes(
--- a/repertory/librepertory/src/app_config.cpp
+++ b/repertory/librepertory/src/app_config.cpp
@@ -67,7 +67,7 @@ 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_port_(default_rpc_port(prov)),
+      api_port_(default_rpc_port()),
      api_user_(std::string{REPERTORY}),
      config_changed_(false),
      download_timeout_secs_(default_download_timeout_secs),
@@ -743,17 +743,7 @@ 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(const provider_type &prov) -> std::uint16_t {
-  static const std::array<std::uint16_t,
-                          static_cast<std::size_t>(provider_type::unknown)>
-      PROVIDER_RPC_PORTS = {
-          10000U,
-          10010U,
-          10100U,
-          10002U,
-      };
-  return PROVIDER_RPC_PORTS.at(static_cast<std::size_t>(prov));
-}
+auto app_config::default_rpc_port() -> std::uint16_t { return 10000U; }

 auto app_config::get_api_password() const -> std::string {
  return api_password_;
@@ -943,24 +933,18 @@ 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)>
+                          static_cast<std::size_t>(provider_type::unknown) + 1U>
      PROVIDER_DISPLAY_NAMES = {
-          "Sia",
-          "Remote",
-          "S3",
-          "Encrypt",
+          "Sia", "Remote", "S3", "Encrypt", "Unknown",
      };
  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)>
+                          static_cast<std::size_t>(provider_type::unknown) + 1U>
      PROVIDER_NAMES = {
-          "sia",
-          "remote",
-          "s3",
-          "encrypt",
+          "sia", "remote", "s3", "encrypt", "unknown",
      };
  return PROVIDER_NAMES.at(static_cast<std::size_t>(prov));
 }
--- a/repertory/librepertory/src/platform/unix_platform.cpp
+++ b/repertory/librepertory/src/platform/unix_platform.cpp
@@ -21,9 +21,8 @@
 */
 #if !defined(_WIN32)

-#include "platform/unix_platform.hpp"
+#include "platform/platform.hpp"

-#include "app_config.hpp"
 #include "events/event_system.hpp"
 #include "events/types/filesystem_item_added.hpp"
 #include "providers/i_provider.hpp"
@@ -36,61 +35,65 @@
 #include "utils/unix.hpp"

 namespace repertory {
-lock_data::lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
-    : pt_(pt),
-      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(provider_type prov, std::string_view unique_id)
+    : mutex_id_(create_lock_id(prov, unique_id)) {
+  handle_ = 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(); }

-lock_data::~lock_data() {
-  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();
+auto lock_data::get_lock_data_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, {"mountstate_" + std::to_string(getuid()) + ".json"});
+      dir, {
+               fmt::format("{}_{}.json", mutex_id_, getuid()),
+           });
 }

-auto lock_data::get_lock_file() -> std::string {
-  const auto dir = get_state_directory();
+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,
-                              {mutex_id_ + "_" + std::to_string(getuid())});
+  return utils::path::combine(
+      dir, {
+               fmt::format("{}_{}.lock", mutex_id_, getuid()),
+           });
 }

 auto lock_data::get_mount_state(json &mount_state) -> bool {
-  auto ret = false;
-  auto fd =
-      open(get_lock_data_file().c_str(), O_CREAT | O_RDWR, S_IWUSR | S_IRUSR);
-  if (fd != -1) {
-    if (wait_for_lock(fd) == 0) {
-      ret = utils::file::read_json_file(get_lock_data_file(), mount_state);
-      flock(fd, LOCK_UN);
+  auto handle = open(get_lock_data_file().c_str(), O_RDWR, S_IWUSR | S_IRUSR);
+  if (handle == -1) {
+    mount_state = {
+        {"Active", false},
+        {"Location", ""},
+        {"PID", -1},
+    };
+
+    return true;
  }

-    close(fd);
+  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);
  return ret;
 }

@@ -98,25 +101,20 @@ 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
+#else  // !defined(__APPLE__)
  return utils::path::absolute("~/.local/" + std::string{REPERTORY_DATA_NAME} +
                               "/state");
-#endif
+#endif // defined(__APPLE__)
 }

 auto lock_data::grab_lock(std::uint8_t retry_count) -> lock_result {
-  REPERTORY_USES_FUNCTION_NAME();
-
-  if (lock_fd_ == -1) {
+  if (handle_ == -1) {
    return lock_result::failure;
  }

-  lock_status_ = wait_for_lock(lock_fd_, retry_count);
+  lock_status_ = wait_for_lock(handle_, 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;
@@ -125,42 +123,54 @@ auto lock_data::grab_lock(std::uint8_t retry_count) -> lock_result {
  }
 }

-auto lock_data::set_mount_state(bool active, const std::string &mount_location,
+void lock_data::release() {
+  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;
+  }
+
+  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(mount_id) == mount_state.end()) ||
-          (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] = {
+    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},
-        };
-        ret = utils::file::write_json_file(get_lock_data_file(), json_data);
+            });
+      }
    } else {
      ret = true;
    }
@@ -169,17 +179,16 @@ auto lock_data::set_mount_state(bool active, const std::string &mount_location,
  }

  close(handle);
-  }
  return ret;
 }

-auto lock_data::wait_for_lock(int fd, std::uint8_t retry_count) -> int {
-  static constexpr const std::uint32_t max_sleep = 100U;
+auto lock_data::wait_for_lock(int handle, std::uint8_t retry_count) -> int {
+  static constexpr const std::uint32_t max_sleep{100U};

-  auto lock_status = EWOULDBLOCK;
-  auto remain = static_cast<std::uint32_t>(retry_count * max_sleep);
+  auto lock_status{EWOULDBLOCK};
+  auto remain{static_cast<std::uint32_t>(retry_count * max_sleep)};
  while ((remain > 0) && (lock_status == EWOULDBLOCK)) {
-    lock_status = flock(fd, LOCK_EX | LOCK_NB);
+    lock_status = flock(handle, LOCK_EX | LOCK_NB);
    if (lock_status == -1) {
      lock_status = errno;
      if (lock_status == EWOULDBLOCK) {
@@ -228,13 +237,13 @@ auto provider_meta_handler(i_provider &provider, bool directory,
                           const api_file &file) -> api_error {
  REPERTORY_USES_FUNCTION_NAME();

-  const auto meta = create_meta_attributes(
+  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) {
--- a/repertory/librepertory/src/platform/win32_platform.cpp
+++ b/repertory/librepertory/src/platform/win32_platform.cpp
@@ -21,150 +21,171 @@
 */
 #if defined(_WIN32)

-#include "platform/win32_platform.hpp"
+#include "platform/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 {
-auto lock_data::get_mount_state(const provider_type & /*pt*/, json &mount_state)
-    -> bool {
-  const auto ret = get_mount_state(mount_state);
-  if (ret) {
-    const auto mount_id =
-        app_config::get_provider_display_name(pt_) + unique_id_;
-    mount_state = mount_state[mount_id].empty()
-                      ? json({{"Active", false}, {"Location", ""}, {"PID", -1}})
-                      : mount_state[mount_id];
+lock_data::lock_data(provider_type prov, std::string unique_id)
+    : mutex_id_(create_lock_id(prov, unique_id)),
+      mutex_handle_(::CreateMutex(nullptr, FALSE,
+                                  create_lock_id(prov, unique_id).c_str())) {}
+
+lock_data::~lock_data() { release(); }
+
+auto lock_data::get_current_mount_state(json &mount_state) -> bool {
+  REPERTORY_USES_FUNCTION_NAME();
+
+  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 {
-  HKEY key;
-  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;
+  if (not get_current_mount_state(mount_state)) {
+    return false;
  }
-    }
-    ::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 {
-  REPERTORY_USES_FUNCTION_NAME();
+  static constexpr const std::uint32_t max_sleep{100U};

-  auto ret = lock_result::success;
  if (mutex_handle_ == INVALID_HANDLE_VALUE) {
-    ret = lock_result::failure;
-  } else {
-    for (auto i = 0;
-         (i <= retry_count) && ((mutex_state_ = ::WaitForSingleObject(
-                                     mutex_handle_, 100)) == WAIT_TIMEOUT);
-         i++) {
+    return lock_result::failure;
+  }
+
+  for (std::uint8_t idx = 0U;
+       (idx <= retry_count) &&
+       ((mutex_state_ = ::WaitForSingleObject(mutex_handle_, max_sleep)) ==
+        WAIT_TIMEOUT);
+       ++idx) {
  }

  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_OBJECT_0:
+    return lock_result::success;

  case WAIT_TIMEOUT:
-      ret = lock_result::locked;
-      break;
+    return lock_result::locked;

  default:
-      ret = lock_result::failure;
-      break;
+    return lock_result::failure;
  }
 }

-  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,
+                                std::int64_t pid) -> bool {
+  if (mutex_handle_ == INVALID_HANDLE_VALUE) {
+    return false;
  }

-auto lock_data::set_mount_state(bool active, const std::string &mount_location,
-                                const std::int64_t &pid) -> bool {
-  auto ret = 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);
-    if ((mount_state.find(mount_id) == mount_state.end()) ||
-        (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)))) {
-      HKEY key;
-      if ((ret = !::RegCreateKeyEx(
-               HKEY_CURRENT_USER,
-               ("SOFTWARE\\" + std::string{REPERTORY_DATA_NAME} + "\\Mounts")
-                   .c_str(),
-               0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &key, nullptr))) {
-        const auto str = json({{"Active", active},
-                               {"Location", active ? mount_location : ""},
-                               {"PID", active ? pid : -1}})
-                             .dump(0);
-        ret = !::RegSetValueEx(key, &mount_id[0], 0, REG_SZ,
-                               reinterpret_cast<const BYTE *>(&str[0]),
-                               static_cast<DWORD>(str.size()));
-        ::RegCloseKey(key);
-      }
-    } else {
-      ret = true;
-    }
+  [[maybe_unused]] auto success{get_mount_state(mount_state)};
+  if (not((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))))) {
+    return true;
  }

+  HKEY key{};
+  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(),
+            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;
 }

@@ -215,4 +236,4 @@ auto provider_meta_handler(i_provider &provider, bool directory,
 }
 } // namespace repertory

-#endif //_WIN32
+#endif // defined(_WIN32)
--- a/repertory/librepertory/src/rpc/server/server.cpp
+++ b/repertory/librepertory/src/rpc/server/server.cpp
@@ -29,9 +29,7 @@
 #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) {}
@@ -143,8 +141,21 @@ void server::start() {

  initialize(*server_);

-  server_thread_ = std::make_unique<std::thread>(
-      [this]() { server_->listen("127.0.0.1", config_.get_api_port()); });
+  server_thread_ = std::make_unique<std::thread>([this]() {
+    server_->set_socket_options([](auto &&sock) {
+#if defined(_WIN32)
+      int enable{1};
+      setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
+                 reinterpret_cast<const char *>(&enable), sizeof(enable));
+#else  //  !defined(_WIN32)
+      linger opt{1, 0};
+      setsockopt(sock, SOL_SOCKET, SO_LINGER,
+                 reinterpret_cast<const char *>(&opt), sizeof(opt));
+#endif // defined(_WIN32)
+    });
+
+    server_->listen("127.0.0.1", config_.get_api_port());
+  });
  event_system::instance().raise<service_start_end>(function_name, "server");
 }

--- a/repertory/librepertory/src/utils/platform.cpp
+++ b/repertory/librepertory/src/utils/platform.cpp
@@ -0,0 +1,31 @@
+/*
+  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
--- a/repertory/repertory/include/cli/mount.hpp
+++ b/repertory/repertory/include/cli/mount.hpp
@@ -28,14 +28,13 @@
 #include "providers/provider.hpp"
 #include "types/repertory.hpp"
 #include "utils/cli_utils.hpp"
-#include "utils/com_init_wrapper.hpp"
-#include "utils/file_utils.hpp"
-#include "utils/string.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;
@@ -57,24 +56,36 @@ 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 {
-  auto ret = exit_code::success;
+  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);
-  const auto res = lock.grab_lock();
-  if (res == lock_result::locked) {
-    ret = exit_code::mount_active;
+  auto lock_result = lock.grab_lock();
+  if (lock_result == lock_result::locked) {
    std::cerr << app_config::get_provider_display_name(prov)
              << " mount is already active" << std::endl;
-  } else if (res == lock_result::success) {
-    const auto generate_config = utils::cli::has_option(
-        args, utils::cli::options::generate_config_option);
-    if (generate_config) {
+    return exit_code::mount_active;
+  }
+
+  if (lock_result != lock_result::success) {
+    std::cerr << "FATAL: Unable to get provider lock" << std::endl;
+    return exit_code::lock_failed;
+  }
+
+  if (utils::cli::has_option(args,
+                             utils::cli::options::generate_config_option)) {
    app_config config(prov, data_directory);
    if (prov == provider_type::remote) {
-        auto cfg = config.get_remote_config();
-        cfg.host_name_or_ip = remote_host;
-        cfg.api_port = remote_port;
-        config.set_remote_config(cfg);
+      auto remote_config = config.get_remote_config();
+      remote_config.host_name_or_ip = remote_host;
+      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 =
@@ -84,103 +95,104 @@ mount(std::vector<const char *> args, std::string data_directory,
    std::cout << "Generated " << app_config::get_provider_display_name(prov)
              << " Configuration" << std::endl;
    std::cout << config.get_config_file_path() << std::endl;
-      ret = utils::file::file(config.get_config_file_path()).exists()
+    return utils::file::file(config.get_config_file_path()).exists()
               ? 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);
+
+  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 cw;
+  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 lock2(prov, unique_id);
-        if (lock2.grab_lock() == lock_result::success) {
-          if (not lock2.set_mount_state(false, "", -1)) {
+    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;
      }
-          lock2.release();
+      prov_lock.release();
    }

    return exit_code::mount_result;
  }
 #endif // defined(_WIN32)
-      std::cout << "Initializing "
-                << app_config::get_provider_display_name(prov)
+
+  std::cout << "Initializing " << app_config::get_provider_display_name(prov)
            << (unique_id.empty() ? ""
                : (prov == provider_type::remote)
-                        ? " [" + remote_host + ':' +
-                              std::to_string(remote_port) + ']'
+                    ? " [" + 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 {
+      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));
+            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();
      mount_result = drive.mount(drive_args);
-            ret = exit_code::mount_result;
+      return 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;
+
+    return exit_code::startup_exception;
  }
-      } else {
-        if (prov == provider_type::sia &&
-            config.get_sia_config().bucket.empty()) {
+
+  try {
+    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;
    }
+
+    global_lock.release();
    mount_result = drive.mount(drive_args);
-          ret = exit_code::mount_result;
+    return 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;
  }

-  return ret;
+  return exit_code::startup_exception;
 }
 } // namespace repertory::cli::actions

--- a/repertory/repertory/include/ui/handlers.hpp
+++ b/repertory/repertory/include/ui/handlers.hpp
@@ -74,6 +74,8 @@ 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_mount(const httplib::Request &req,
                        httplib::Response &res) const;

@@ -92,7 +94,9 @@ private:
  void handle_post_add_mount(const httplib::Request &req,
                             httplib::Response &res) const;

-  void handle_post_mount(const httplib::Request &req,
+  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,
--- a/repertory/repertory/src/ui/handlers.cpp
+++ b/repertory/repertory/src/ui/handlers.cpp
@@ -109,6 +109,18 @@ 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,
             auto &&res) -> httplib::Server::HandlerResponse {
@@ -160,6 +172,10 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
                     : http_error_codes::internal_error;
  });

+  server->Get("/api/v1/locations", [](auto && /* req */, auto &&res) {
+    handle_get_available_locations(res);
+  });
+
  server->Get("/api/v1/mount",
              [this](auto &&req, auto &&res) { handle_get_mount(req, res); });

@@ -189,6 +205,10 @@ 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);
  });
@@ -286,6 +306,52 @@ auto handlers::data_directory_exists(provider_type prov,
  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)) {
+    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();
@@ -366,8 +432,6 @@ 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"));

@@ -376,34 +440,9 @@ 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"});

-  nlohmann::json result(
-      nlohmann::json::parse(utils::string::join(lines, '\n')).at(status_name));
+  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>()) {
@@ -449,14 +488,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 subKey = fmt::format("{}.{}", key, key2);
+        auto sub_key = fmt::format("{}.{}", key, key2);
        auto skip{false};
        auto decrypted = decrypt_value(
-            config_, subKey, value2.template get<std::string>(), skip);
+            config_, sub_key, value2.template get<std::string>(), skip);
        if (skip) {
          continue;
        }
-        values[subKey] = decrypted;
+        values[sub_key] = decrypted;
      }

      continue;
@@ -480,7 +519,7 @@ void handlers::handle_post_add_mount(const httplib::Request &req,
 }

 void handlers::handle_post_mount(const httplib::Request &req,
-                                 httplib::Response &res) const {
+                                 httplib::Response &res) {
  auto name = req.get_param_value("name");
  auto prov = provider_type_from_string(req.get_param_value("type"));

@@ -500,12 +539,18 @@ void handlers::handle_post_mount(const httplib::Request &req,
 #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;
    }

-    launch_process(prov, name, {location}, true);
    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;
@@ -535,7 +580,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 {
-  nlohmann::json data = nlohmann::json::parse(req.get_param_value("data"));
+  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>(),
@@ -614,10 +659,8 @@ 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_);
-#elif defined(__linux__) // defined(__linux__)
+#else  // !defined(_WIN32)
    args.insert(args.begin(), repertory_binary_);
-#else                    // !defined(__linux__) && !defined(_WIN32)
-    build fails here
 #endif // defined(_WIN32)

    std::vector<const char *> exec_args;
@@ -630,16 +673,9 @@ 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()));
-#elif defined(__linux__) // defined(__linux__)
+#else  // !defined(_WIN32)
    auto pid = fork();
-    if (pid < 0) {
-      throw utils::error::create_exception(function_name, {"mount failed"});
-    }
-
-    if (pid != 0) {
-      return {};
-    }
-
+    if (pid == 0) {
      setsid();
      chdir("/");
      close(STDIN_FILENO);
@@ -649,10 +685,10 @@ auto handlers::launch_process(provider_type prov, std::string_view name,
      open("/dev/null", O_WRONLY);
      open("/dev/null", O_WRONLY);

-    signal(SIGCHLD, SIG_IGN);
      execvp(exec_args.at(0U), const_cast<char *const *>(exec_args.data()));
-#else                    // !defined(__linux__) && !defined(_WIN32)
-    build fails here
+    } else {
+      signal(SIGCHLD, SIG_IGN);
+    }
 #endif // defined(_WIN32)
    return {};
  }
--- a/repertory/repertory/src/ui/mgmt_app_config.cpp
+++ b/repertory/repertory/src/ui/mgmt_app_config.cpp
@@ -181,10 +181,6 @@ 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;
--- a/repertory/repertory_test/src/app_config_test.cpp
+++ b/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(prov)},
+      {JSON_API_PORT, app_config::default_rpc_port()},
      {JSON_API_USER, std::string{REPERTORY}},
      {JSON_DOWNLOAD_TIMEOUT_SECS, default_download_timeout_secs},
      {JSON_DATABASE_TYPE, database_type::rocksdb},
--- a/repertory/repertory_test/src/lock_data_test.cpp
+++ b/repertory/repertory_test/src/lock_data_test.cpp
@@ -62,13 +62,16 @@ 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["Sia1"].dump().c_str());
+               mount_state.dump().c_str());
+
+  EXPECT_TRUE(l2.get_mount_state(mount_state));
  EXPECT_STREQ(R"({"Active":true,"Location":"D:","PID":97})",
-               mount_state["Remote1"].dump().c_str());
+               mount_state.dump().c_str());
+
+  EXPECT_TRUE(l3.get_mount_state(mount_state));
  EXPECT_STREQ(R"({"Active":true,"Location":"E:","PID":96})",
-               mount_state["Remote2"].dump().c_str());
+               mount_state.dump().c_str());

  EXPECT_TRUE(l.set_mount_state(false, "C:", 99));
  EXPECT_TRUE(l2.set_mount_state(false, "D:", 98));
@@ -76,11 +79,15 @@ 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["Sia1"].dump().c_str());
+               mount_state.dump().c_str());
+
+  EXPECT_TRUE(l2.get_mount_state(mount_state));
  EXPECT_STREQ(R"({"Active":false,"Location":"","PID":-1})",
-               mount_state["Remote1"].dump().c_str());
+               mount_state.dump().c_str());
+
+  EXPECT_TRUE(l3.get_mount_state(mount_state));
  EXPECT_STREQ(R"({"Active":false,"Location":"","PID":-1})",
-               mount_state["Remote2"].dump().c_str());
+               mount_state.dump().c_str());
 }
 #else
 TEST(lock_data_test, set_and_unset_mount_state) {
@@ -91,14 +98,13 @@ 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["Sia1"].dump().c_str());
+               mount_state.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["Sia1"].dump().c_str());
+               mount_state.dump().c_str());
 }
 #endif
 } // namespace repertory
--- a/support/src/utils/common.cpp
+++ b/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) -> std::int32_t {
+auto compare_version_strings(std::string version1, std::string version2)
+    -> std::int32_t {

  if (utils::string::contains(version1, "-")) {
    version1 = utils::string::split(version1, '-', true)[0U];
@@ -131,23 +131,46 @@ 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};
+  while (check_port <= 65535U) {
+    {
+      io_context ctx{};
+      tcp::socket socket(ctx);
+      socket.connect(
+          {
+              tcp::endpoint(ip::address_v4::loopback(),
+                            static_cast<std::uint16_t>(check_port)),
+          },
+          error_code);
+      if (not error_code) {
+        ++check_port;
+        continue;
+      }
+    }
+
+    {
      io_context ctx{};
      tcp::acceptor acceptor(ctx);
-    acceptor.open(tcp::v4(), error_code) ||
-        acceptor.bind({tcp::v4(), first_port}, error_code);
-    if (not error_code) {
-      break;
+      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;
+      }
    }

-    ++first_port;
+    available_port = static_cast<std::uint16_t>(check_port);
+    return true;
  }

-  if (not error_code) {
-    available_port = first_port;
-  }
-
-  return not error_code;
+  return false;
 }
 #endif // defined(PROJECT_ENABLE_BOOST)

--- a/web/repertory/lib/constants.dart
+++ b/web/repertory/lib/constants.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart' show GlobalKey, NavigatorState;
 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'];
--- a/web/repertory/lib/helpers.dart
+++ b/web/repertory/lib/helpers.dart
@@ -3,7 +3,8 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:repertory/constants.dart' as constants;
-import 'package:sodium_libs/sodium_libs.dart';
+import 'package:repertory/models/auth.dart';
+import 'package:sodium_libs/sodium_libs.dart' show SecureKey, StringX;

 typedef Validator = bool Function(String);

@@ -106,25 +107,31 @@ Map<String, dynamic> createDefaultSettings(String mountType) {
  return {};
 }

-void displayAuthError() {
-  if (constants.navigatorKey.currentContext == null) {
+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) {
+void displayErrorMessage(context, String text, {bool clear = false}) {
  if (!context.mounted) {
    return;
  }

-  ScaffoldMessenger.of(
-    context,
-  ).showSnackBar(SnackBar(content: Text(text, textAlign: TextAlign.center)));
+  final messenger = ScaffoldMessenger.of(context);
+  if (clear) {
+    messenger.removeCurrentSnackBar();
+  }
+
+  messenger.showSnackBar(
+    SnackBar(content: Text(text, textAlign: TextAlign.center)),
+  );
 }

 String formatMountName(String type, String name) {
@@ -329,3 +336,67 @@ 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),
+          );
+        },
+      );
+    },
+  );
+}
--- a/web/repertory/lib/main.dart
+++ b/web/repertory/lib/main.dart
@@ -116,7 +116,7 @@ class AuthCheck extends StatelessWidget {
              constants.navigatorKey.currentContext!,
            ).pushNamedAndRemoveUntil('/auth', (Route<dynamic> route) => false);
          });
-          return SizedBox.shrink();
+          return child;
        }

        return child;
--- a/web/repertory/lib/models/auth.dart
+++ b/web/repertory/lib/models/auth.dart
@@ -5,12 +5,14 @@ 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;
@@ -52,8 +54,11 @@ class Auth with ChangeNotifier {

  void logoff() {
    _authenticated = false;
+    _key = SecureKey.random(constants.sodium, 32);
    _user = "";

    notifyListeners();
+
+    mountList?.clear();
  }
 }
--- a/web/repertory/lib/models/mount.dart
+++ b/web/repertory/lib/models/mount.dart
@@ -101,6 +101,61 @@ 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();
+      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 {
    try {
      final auth = await _auth.createAuth();
@@ -152,7 +207,7 @@ class Mount with ChangeNotifier {
      );

      if (response.statusCode == 401) {
-        displayAuthError();
+        displayAuthError(_auth);
        _auth.logoff();
        return false;
      }
@@ -163,12 +218,15 @@ class Mount with ChangeNotifier {
        return true;
      }

+      final badLocation = (!unmount && response.statusCode == 500);
+      if (badLocation) {
+        mountConfig.path = "";
+      }
+
      await refresh(force: true);
      _isMounting = false;

-      if (!unmount && response.statusCode == 500) {
-        return false;
-      }
+      return !badLocation;
    } catch (e) {
      debugPrint('$e');
    }
--- a/web/repertory/lib/models/mount_list.dart
+++ b/web/repertory/lib/models/mount_list.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math';

 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
@@ -14,6 +15,7 @@ class MountList with ChangeNotifier {
  final Auth _auth;

  MountList(this._auth) {
+    _auth.mountList = this;
    _auth.addListener(() {
      if (_auth.authenticated) {
        _fetch();
@@ -61,7 +63,7 @@ class MountList with ChangeNotifier {
      );

      if (response.statusCode == 401) {
-        displayAuthError();
+        displayAuthError(_auth);
        _auth.logoff();
        return;
      }
@@ -110,10 +112,19 @@ class MountList with ChangeNotifier {
  Future<bool> add(
    String type,
    String name,
-    Map<String, dynamic> mountConfig,
+    Map<String, dynamic> settings,
  ) 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;
@@ -128,7 +139,7 @@ class MountList with ChangeNotifier {
    try {
      final auth = await _auth.createAuth();
      final map = await convertAllToString(
-        jsonDecode(jsonEncode(mountConfig)),
+        jsonDecode(jsonEncode(settings)),
        _auth.key,
      );
      final response = await http.post(
@@ -144,7 +155,7 @@ class MountList with ChangeNotifier {
          ret = true;
          break;
        case 401:
-          displayAuthError();
+          displayAuthError(_auth);
          _auth.logoff();
          break;
        case 404:
@@ -166,6 +177,11 @@ class MountList with ChangeNotifier {
    return ret;
  }

+  void clear() {
+    _mountList = [];
+    notifyListeners();
+  }
+
  Future<void> reset() async {
    if (constants.navigatorKey.currentContext == null ||
        ModalRoute.of(constants.navigatorKey.currentContext!)?.settings.name !=
@@ -178,8 +194,7 @@ class MountList with ChangeNotifier {
      'Mount removed externally. Reloading...',
    );

-    _mountList = [];
-    notifyListeners();
+    clear();

    return _fetch();
  }
--- a/web/repertory/lib/screens/add_mount_screen.dart
+++ b/web/repertory/lib/screens/add_mount_screen.dart
@@ -28,7 +28,6 @@ class _AddMountScreenState extends State<AddMountScreen> {
    "S3": createDefaultSettings("S3"),
    "Sia": createDefaultSettings("Sia"),
  };
-  bool _showAdvanced = false;

  @override
  Widget build(BuildContext context) {
@@ -37,14 +36,13 @@ class _AddMountScreenState extends State<AddMountScreen> {
        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
        title: Text(widget.title),
        actions: [
-          Row(
-            children: [
-              const Text("Advanced"),
-              IconButton(
-                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(),
+              );
+            },
          ),
        ],
      ),
@@ -126,16 +124,18 @@ class _AddMountScreenState extends State<AddMountScreen> {
                          isAdd: true,
                          mount: _mount!,
                          settings: _settings[_mountType]!,
-                          showAdvanced: _showAdvanced,
+                          showAdvanced: false,
                        ),
                      ),
                    ),
                  ),
                if (_mount != null) const SizedBox(height: constants.padding),
                if (_mount != null)
-                  Builder(
-                    builder: (context) {
-                      return ElevatedButton.icon(
+                  Row(
+                    children: [
+                      ElevatedButton.icon(
+                        label: const Text('Add'),
+                        icon: const Icon(Icons.add),
                        onPressed: () async {
                          final mountList = Provider.of<MountList>(context);

@@ -188,10 +188,16 @@ class _AddMountScreenState extends State<AddMountScreen> {

                          Navigator.pop(context);
                        },
-                        label: const Text('Add'),
-                        icon: const Icon(Icons.add),
-                      );
-                    },
+                      ),
+                      if (_mountType == 'Sia' || _mountType == 'S3') ...[
+                        const SizedBox(width: constants.padding),
+                        ElevatedButton.icon(
+                          label: const Text('Test'),
+                          icon: const Icon(Icons.check),
+                          onPressed: () async {},
+                        ),
+                      ],
+                    ],
                  ),
              ],
            );
--- a/web/repertory/lib/screens/auth_screen.dart
+++ b/web/repertory/lib/screens/auth_screen.dart
@@ -26,41 +26,20 @@ class _AuthScreenState extends State<AuthScreen> {
      body: Consumer<Auth>(
        builder: (context, auth, _) {
          if (auth.authenticated) {
-            Navigator.of(context).pushReplacementNamed('/');
+            Future.delayed(Duration(milliseconds: 1), () {
+              if (constants.navigatorKey.currentContext == null) {
+                return;
+              }
+
+              Navigator.of(
+                constants.navigatorKey.currentContext!,
+              ).pushNamedAndRemoveUntil('/', (Route<dynamic> route) => false);
+            });
            return SizedBox.shrink();
          }

-          return Center(
-            child: Card(
-              child: Padding(
-                padding: const EdgeInsets.all(constants.padding),
-                child: SizedBox(
-                  width: 400,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Text(
-                        'Logon to Repertory Portal',
-                        textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      const SizedBox(height: constants.padding),
-                      TextField(
-                        decoration: InputDecoration(labelText: 'Username'),
-                        controller: _userController,
-                      ),
-                      const SizedBox(height: constants.padding),
-                      TextField(
-                        obscureText: true,
-                        decoration: InputDecoration(labelText: 'Password'),
-                        controller: _passwordController,
-                      ),
-                      const SizedBox(height: constants.padding),
-                      ElevatedButton(
-                        onPressed:
-                            _enabled
+          createLoginHandler() {
+            return _enabled
                ? () async {
                  setState(() => _enabled = false);
                  await auth.authenticate(
@@ -69,7 +48,50 @@ class _AuthScreenState extends State<AuthScreen> {
                  );
                  setState(() => _enabled = true);
                }
-                                : null,
+                : 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'),
                      ),
                    ],
--- a/web/repertory/lib/screens/edit_mount_screen.dart
+++ b/web/repertory/lib/screens/edit_mount_screen.dart
@@ -1,6 +1,8 @@
 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';

@@ -23,12 +25,27 @@ class _EditMountScreenState extends State<EditMountScreen> {
        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
        title: Text(widget.title),
        actions: [
+          Row(
+            children: [
              Row(
                children: [
                  const Text("Advanced"),
                  IconButton(
-                icon: Icon(_showAdvanced ? Icons.toggle_on : Icons.toggle_off),
-                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(),
+                  );
+                },
              ),
            ],
          ),
--- a/web/repertory/lib/screens/edit_settings_screen.dart
+++ b/web/repertory/lib/screens/edit_settings_screen.dart
@@ -22,6 +22,16 @@ class _EditSettingsScreenState extends State<EditSettingsScreen> {
      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) {
--- a/web/repertory/lib/screens/home_screen.dart
+++ b/web/repertory/lib/screens/home_screen.dart
@@ -1,5 +1,7 @@
 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 {
@@ -21,6 +23,16 @@ class _HomeScreeState extends State<HomeScreen> {
          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),
--- a/web/repertory/lib/types/mount_config.dart
+++ b/web/repertory/lib/types/mount_config.dart
@@ -4,7 +4,7 @@ import 'package:repertory/helpers.dart' show initialCaps;
 class MountConfig {
  bool? mounted;
  final String _name;
-  String _path = '';
+  String path = '';
  Map<String, dynamic> _settings = {};
  final String _type;
  MountConfig({required name, required type, Map<String, dynamic>? settings})
@@ -17,7 +17,6 @@ class MountConfig {

  String? get bucket => _settings['${provider}Config']?["Bucket"] as String;
  String get name => _name;
-  String get path => _path;
  String get provider => initialCaps(_type);
  UnmodifiableMapView<String, dynamic> get settings =>
      UnmodifiableMapView<String, dynamic>(_settings);
@@ -28,7 +27,7 @@ class MountConfig {
  }

  void updateStatus(Map<String, dynamic> status) {
-    _path = status['Location'] as String;
+    path = status['Location'] as String;
    mounted = status['Active'] as bool;
  }
 }
--- a/web/repertory/lib/widgets/mount_settings.dart
+++ b/web/repertory/lib/widgets/mount_settings.dart
@@ -623,17 +623,22 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
        widget.settings,
      );
      if (settings.isNotEmpty) {
-        final authProvider = Provider.of<Auth>(context, listen: false);
-        convertAllToString(settings, authProvider.key).then((map) {
+        final mount = widget.mount;
+        final key =
+            Provider.of<Auth>(
+              constants.navigatorKey.currentContext!,
+              listen: false,
+            ).key;
+        convertAllToString(settings, key).then((map) {
          map.forEach((key, value) {
            if (value is Map<String, dynamic>) {
              value.forEach((subKey, subValue) {
-                widget.mount.setValue('$key.$subKey', subValue);
+                mount.setValue('$key.$subKey', subValue);
              });
              return;
            }

-            widget.mount.setValue(key, value);
+            mount.setValue(key, value);
          });
        });
      }
--- a/web/repertory/lib/widgets/mount_widget.dart
+++ b/web/repertory/lib/widgets/mount_widget.dart
@@ -17,6 +17,7 @@ class MountWidget extends StatefulWidget {

 class _MountWidgetState extends State<MountWidget> {
  bool _enabled = true;
+  bool _editEnabled = true;
  Timer? _timer;

  @override
@@ -61,7 +62,33 @@ class _MountWidgetState extends State<MountWidget> {
              mount.provider,
              style: TextStyle(color: textColor, fontWeight: FontWeight.bold),
            ),
-            trailing: IconButton(
+            trailing: Row(
+              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
@@ -73,8 +100,16 @@ class _MountWidgetState extends State<MountWidget> {
                            ? Color.fromARGB(255, 163, 96, 76)
                            : subTextColor,
                  ),
+                  tooltip:
+                      mount.mounted == null
+                          ? ''
+                          : mount.mounted!
+                          ? 'Unmount'
+                          : 'Mount',
                  onPressed: _createMountHandler(context, mount),
                ),
+              ],
+            ),
          );
        },
      ),
@@ -149,42 +184,7 @@ class _MountWidgetState extends State<MountWidget> {
      return location;
    }

-    String? currentLocation;
-    return await showDialog(
-      context: context,
-      builder: (context) {
-        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: TextField(
-            autofocus: true,
-            controller: TextEditingController(text: currentLocation),
-            inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s'))],
-            onChanged: (value) => currentLocation = value,
-          ),
-          title: const Text('Set Mount Location'),
-        );
-      },
-    );
+    return editMountLocation(context, await mount.getAvailableLocations());
  }

  @override
--- a/web/repertory/lib/widgets/ui_settings.dart
+++ b/web/repertory/lib/widgets/ui_settings.dart
@@ -3,6 +3,7 @@ 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,
@@ -105,10 +106,19 @@ class _UISettingsWidgetState extends State<UISettingsWidget> {
  void dispose() {
    final settings = getChanged(widget.origSettings, widget.settings);
    if (settings.isNotEmpty) {
-      final authProvider = Provider.of<Auth>(context, listen: false);
-      convertAllToString(settings, authProvider.key)
+      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(
@@ -119,9 +129,8 @@ class _UISettingsWidgetState extends State<UISettingsWidget> {
              );

              if (response.statusCode == 401) {
-                displayAuthError();
+                displayAuthError(authProvider);
                authProvider.logoff();
-                return;
              }
            } catch (e) {
              debugPrint('$e');