Add locking to credentials

Author: Matt-Woz

core/origin.cxx

@@ -315,12 +315,37 @@ origin::to_json() const -> std::string
 
 } // namespace couchbase::core
 
+couchbase::core::origin::origin(origin&& other) noexcept
+  : options_(std::move(other.options_))
+  , nodes_(std::move(other.nodes_))
+  , next_node_(std::move(other.next_node_))
+  , exhausted_(other.exhausted_)
+  , connection_string_(std::move(other.connection_string_))
+{
+  update_credentials(other.credentials());
+}
+
+auto
+couchbase::core::origin::operator=(origin&& other) -> origin&
+{
+  if (this != &other) {
+    options_ = std::move(other.options_);
+    nodes_ = std::move(other.nodes_);
+    next_node_ = std::move(other.next_node_);
+    exhausted_ = other.exhausted_;
+    connection_string_ = std::move(other.connection_string_);
+    update_credentials(other.credentials());
+  }
+  return *this;
+}
+
 couchbase::core::origin::origin(const couchbase::core::origin& other)
   : options_(other.options_)
-  , credentials_(other.credentials_)
   , nodes_(other.nodes_)
   , next_node_(nodes_.begin())
 {
+  std::shared_lock lock(other.credentials_mutex_);
+  credentials_ = other.credentials_;
 }
 
 couchbase::core::origin::origin(origin other, const topology::configuration& config)
@@ -334,25 +359,26 @@ couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
                                 std::uint16_t port,
                                 couchbase::core::cluster_options options)
   : options_(std::move(options))
-  , credentials_(std::move(auth))
   , nodes_{ { hostname, std::to_string(port) } }
   , next_node_(nodes_.begin())
 {
+  std::shared_lock lock(credentials_mutex_);
+  credentials_ = std::move(auth);
 }
 couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
                                 const std::string& hostname,
                                 const std::string& port,
                                 couchbase::core::cluster_options options)
   : options_(std::move(options))
-  , credentials_(std::move(auth))
   , nodes_{ { hostname, port } }
   , next_node_(nodes_.begin())
 {
+  std::shared_lock lock(credentials_mutex_);
+  credentials_ = std::move(auth);
 }
 couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
                                 const couchbase::core::utils::connection_string& connstr)
   : options_(connstr.options)
-  , credentials_(std::move(auth))
   , connection_string_(connstr.input)
 {
   nodes_.reserve(connstr.bootstrap_nodes.size());
@@ -365,13 +391,16 @@ couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
     shuffle_nodes();
   }
   next_node_ = nodes_.begin();
+
+  std::unique_lock lock(credentials_mutex_);
+  credentials_ = std::move(auth);
 }
 auto
 couchbase::core::origin::operator=(const couchbase::core::origin& other) -> couchbase::core::origin&
 {
   if (this != &other) {
     options_ = other.options_;
-    credentials_ = other.credentials_;
+    update_credentials(other.credentials());
     nodes_ = other.nodes_;
     next_node_ = nodes_.begin();
     exhausted_ = false;
@@ -384,23 +413,27 @@ couchbase::core::origin::connection_string() const -> const std::string&
   return connection_string_;
 }
 auto
-couchbase::core::origin::username() const -> const std::string&
+couchbase::core::origin::username() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.username;
 }
 auto
-couchbase::core::origin::password() const -> const std::string&
+couchbase::core::origin::password() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.password;
 }
 auto
-couchbase::core::origin::certificate_path() const -> const std::string&
+couchbase::core::origin::certificate_path() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.certificate_path;
 }
 auto
-couchbase::core::origin::key_path() const -> const std::string&
+couchbase::core::origin::key_path() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.key_path;
 }
 auto
@@ -471,6 +504,7 @@ couchbase::core::origin::set_nodes_from_config(const topology::configuration& co
 void
 couchbase::core::origin::update_credentials(cluster_credentials auth)
 {
+  const std::unique_lock lock(credentials_mutex_);
   credentials_ = std::move(auth);
 }
 auto
@@ -508,7 +542,8 @@ couchbase::core::origin::options() -> couchbase::core::cluster_options&
   return options_;
 }
 auto
-couchbase::core::origin::credentials() const -> const couchbase::core::cluster_credentials&
+couchbase::core::origin::credentials() const -> couchbase::core::cluster_credentials
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_;
 }

core/origin.hxx

@@ -20,6 +20,7 @@
 #include "cluster_credentials.hxx"
 #include "cluster_options.hxx"
 
+#include <shared_mutex>
 #include <string>
 #include <utility>
 #include <vector>
@@ -43,7 +44,7 @@ struct origin {
   origin() = default;
   ~origin() = default;
 
-  origin(origin&& other) = default;
+  origin(origin&& other) noexcept;
   origin(const origin& other);
   origin(origin other, const topology::configuration& config);
   origin(cluster_credentials auth,
@@ -55,14 +56,14 @@ struct origin {
          const std::string& port,
          cluster_options options);
   origin(cluster_credentials auth, const utils::connection_string& connstr);
-  auto operator=(origin&& other) -> origin& = default;
+  auto operator=(origin&& other) -> origin&;
   auto operator=(const origin& other) -> origin&;
 
   [[nodiscard]] auto connection_string() const -> const std::string&;
-  [[nodiscard]] auto username() const -> const std::string&;
-  [[nodiscard]] auto password() const -> const std::string&;
-  [[nodiscard]] auto certificate_path() const -> const std::string&;
-  [[nodiscard]] auto key_path() const -> const std::string&;
+  [[nodiscard]] auto username() const -> std::string;
+  [[nodiscard]] auto password() const -> std::string;
+  [[nodiscard]] auto certificate_path() const -> std::string;
+  [[nodiscard]] auto key_path() const -> std::string;
 
   [[nodiscard]] auto get_hostnames() const -> std::vector<std::string>;
   [[nodiscard]] auto get_nodes() const -> std::vector<std::string>;
@@ -81,16 +82,17 @@ struct origin {
 
   [[nodiscard]] auto options() const -> const couchbase::core::cluster_options&;
   [[nodiscard]] auto options() -> couchbase::core::cluster_options&;
-  [[nodiscard]] auto credentials() const -> const couchbase::core::cluster_credentials&;
+  [[nodiscard]] auto credentials() const -> couchbase::core::cluster_credentials;
   [[nodiscard]] auto to_json() const -> std::string;
 
 private:
   couchbase::core::cluster_options options_{};
-  cluster_credentials credentials_{};
   node_list nodes_{};
   node_list::iterator next_node_{};
   bool exhausted_{ false };
   std::string connection_string_{};
+  cluster_credentials credentials_{};
+  mutable std::shared_mutex credentials_mutex_{};
 };
 
 } // namespace couchbase::core