couchbase 3.4.1 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738d96522993c221d75dc83546dc6c9f5447309fbbe4969f6fb92719b0427e78
-  data.tar.gz: 5189c37096e7193f5756050a9713bd7d8f75acd8949e5afe2402fc1834ed538f
+  metadata.gz: 573df37049b91d6dc00b674904dbda7883a4a20e7078191fc01f3b29f139df13
+  data.tar.gz: ec07bdbe1a3cdd5caab78b7bc4af3e525d0dba25e54e8bfb13b5d07203c0361a
 SHA512:
-  metadata.gz: 85632d1eea3c7139c246f80fadbe8135aacd4b550fdd49a0e33a98342846d39d7d1a7b45abd2d03f1ecbecb9fbdb3401d5ef16b2c52e4bfa3c08edcebfa976e3
-  data.tar.gz: 34202c48810d9ebc8c9930a1f860acafa9a97b4de8304a22e56fa811a9462f02a857d277fb3abf1572226244ed05aeaafd61d23689a74aad6cdae83c33669fca
+  metadata.gz: 3b945f9a1942520c04fb22810049bda99e4daecccbadab60c9df474ec9d606a92f253f56e815739e3d64c927727d83d74265973fa72a6493ab38cc27df5f0913
+  data.tar.gz: 7cfa5628c2dc3a4c43741e139e064ac20f1085fd446f3b10cc480fc622464d0396cfa31d470cdca9c7c8323bb37d6b38ef1200c4b8d4b511fea0642a56f699d5

data/README.md

@@ -23,7 +23,7 @@ The library has been tested with MRI 3.0, 3.1 and 3.2. Supported platforms are L
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.4.1"
+gem "couchbase", "3.4.3"
 ```
 
 And then execute:
@@ -139,7 +139,7 @@ Now the API reference is accessible using a web browser (where `VERSION` is the
 
 The gem is available as open source under the terms of the [Apache2 License](https://opensource.org/licenses/Apache-2.0).
 
-    Copyright 2011-2021 Couchbase, Inc.
+    Copyright 2011-Present Couchbase, Inc.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

data/ext/couchbase/CMakeLists.txt

@@ -80,6 +80,7 @@ add_subdirectory(core/tracing)
 add_subdirectory(core/metrics)
 
 set(couchbase_cxx_client_FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx
         core/agent.cxx
         core/agent_config.cxx
         core/agent_group.cxx
@@ -91,7 +92,7 @@ set(couchbase_cxx_client_FILES
         core/cluster_agent_config.cxx
         core/cluster_options.cxx
         core/collections_component.cxx
-        core/config_profile.cxx
+        core/config_profiles.cxx
         core/core_sdk_shim.cxx
         core/crud_component.cxx
         core/dispatcher.cxx
@@ -255,41 +256,74 @@ set(couchbase_cxx_client_FILES
         core/utils/mutation_token.cxx
         core/utils/split_string.cxx
         core/utils/url_codec.cxx
+        core/impl/analytics.cxx
+        core/impl/search.cxx
         core/impl/analytics_error_category.cxx
         core/impl/append.cxx
         core/impl/best_effort_retry_strategy.cxx
+        core/impl/boolean_field_query.cxx
+        core/impl/boolean_query.cxx
         core/impl/build_deferred_query_indexes.cxx
-        core/impl/collection_query_index_manager.cxx
         core/impl/cluster.cxx
+        core/impl/collection_query_index_manager.cxx
         core/impl/common_error_category.cxx
         core/impl/configuration_profiles_registry.cxx
+        core/impl/conjunction_query.cxx
         core/impl/create_query_index.cxx
+        core/impl/date_range.cxx
+        core/impl/date_range_facet.cxx
+        core/impl/date_range_facet_result.cxx
+        core/impl/date_range_query.cxx
         core/impl/decrement.cxx
+        core/impl/disjunction_query.cxx
         core/impl/dns_srv_tracker.cxx
         core/impl/drop_query_index.cxx
         core/impl/exists.cxx
         core/impl/expiry.cxx
         core/impl/fail_fast_retry_strategy.cxx
         core/impl/field_level_encryption_error_category.cxx
+        core/impl/geo_bounding_box_query.cxx
+        core/impl/geo_distance_query.cxx
+        core/impl/geo_polygon_query.cxx
         core/impl/get.cxx
+        core/impl/get_all_query_indexes.cxx
         core/impl/get_all_replicas.cxx
         core/impl/get_and_lock.cxx
         core/impl/get_and_touch.cxx
-        core/impl/get_all_query_indexes.cxx
         core/impl/get_any_replica.cxx
         core/impl/get_replica.cxx
         core/impl/increment.cxx
         core/impl/insert.cxx
+        core/impl/internal_date_range_facet_result.cxx
+        core/impl/internal_numeric_range_facet_result.cxx
+        core/impl/internal_search_error_context.cxx
+        core/impl/internal_search_meta_data.cxx
+        core/impl/internal_search_result.cxx
+        core/impl/internal_search_row.cxx
+        core/impl/internal_search_row_locations.cxx
+        core/impl/internal_term_facet_result.cxx
         core/impl/key_value_error_category.cxx
         core/impl/lookup_in.cxx
         core/impl/management_error_category.cxx
+        core/impl/match_all_query.cxx
+        core/impl/match_none_query.cxx
+        core/impl/match_phrase_query.cxx
+        core/impl/match_query.cxx
         core/impl/mutate_in.cxx
         core/impl/network_error_category.cxx
+        core/impl/numeric_range.cxx
+        core/impl/numeric_range_facet.cxx
+        core/impl/numeric_range_facet_result.cxx
+        core/impl/numeric_range_query.cxx
         core/impl/observe_poll.cxx
         core/impl/observe_seqno.cxx
+        core/impl/phrase_query.cxx
+        core/impl/prefix_query.cxx
         core/impl/prepend.cxx
         core/impl/query.cxx
         core/impl/query_error_category.cxx
+        core/impl/query_string_query.cxx
+        core/impl/regexp_query.cxx
         core/impl/remove.cxx
         core/impl/replace.cxx
         core/impl/retry_action.cxx
@@ -313,6 +347,20 @@ set(couchbase_cxx_client_FILES
         core/impl/subdoc/remove.cxx
         core/impl/subdoc/replace.cxx
         core/impl/subdoc/upsert.cxx
+        core/impl/search.cxx
+        core/impl/search_error_context.cxx
+        core/impl/search_meta_data.cxx
+        core/impl/search_result.cxx
+        core/impl/search_row.cxx
+        core/impl/search_row_location.cxx
+        core/impl/search_row_locations.cxx
+        core/impl/search_sort_field.cxx
+        core/impl/search_sort_id.cxx
+        core/impl/search_sort_score.cxx
+        core/impl/term_facet.cxx
+        core/impl/term_facet_result.cxx
+        core/impl/term_query.cxx
+        core/impl/term_range_query.cxx
         core/impl/touch.cxx
         core/impl/transaction_error_category.cxx
         core/impl/transaction_get_result.cxx
@@ -321,6 +369,8 @@ set(couchbase_cxx_client_FILES
         core/impl/upsert.cxx
         core/impl/view_error_category.cxx
         core/impl/watch_query_indexes.cxx
+        core/impl/wildcard_query.cxx
+        core/io/dns_client.cxx
         core/io/dns_config.cxx
         core/io/http_parser.cxx
         core/io/mcbp_message.cxx
@@ -329,11 +379,12 @@ set(couchbase_cxx_client_FILES
         core/transactions/atr_cleanup_entry.cxx
         core/transactions/atr_ids.cxx
         core/transactions/attempt_context_impl.cxx
+        core/transactions/attempt_context_testing_hooks.cxx
         core/transactions/binary.cxx
+        core/transactions/cleanup_testing_hooks.cxx
         core/transactions/exceptions.cxx
         core/transactions/result.cxx
         core/transactions/staged_mutation.cxx
-        core/transactions/utils.cxx
         core/transactions/transaction_attempt.cxx
         core/transactions/transaction_context.cxx
         core/transactions/transaction_get_result.cxx
@@ -342,7 +393,8 @@ set(couchbase_cxx_client_FILES
         core/transactions/transactions.cxx
         core/transactions/transactions_cleanup.cxx
         core/transactions/transactions_config.cxx
-        core/transactions/uid_generator.cxx)
+        core/transactions/uid_generator.cxx
+        core/transactions/utils.cxx)
 
 if (COUCHBASE_CXX_CLIENT_BUILD_SHARED)
     add_library(couchbase_cxx_client SHARED ${couchbase_cxx_client_FILES})
@@ -401,9 +453,9 @@ endif ()
 if (NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
     if (TARGET PkgConfig::PKG_CONFIG_OPENSSL)
         target_link_libraries(couchbase_cxx_client PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)
-    else()
+    else ()
         target_link_libraries(couchbase_cxx_client PUBLIC OpenSSL::SSL OpenSSL::Crypto)
-    endif()
+    endif ()
 endif ()
 
 option(COUCHBASE_CXX_CLIENT_BUILD_TESTS "Build test programs" TRUE)

data/ext/couchbase/cmake/Documentation.cmake

@@ -20,7 +20,6 @@ if(DOXYGEN_FOUND AND DOT)
   set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html)
   set(DOXYGEN_CONFIG_TEMPLATE ${PROJECT_SOURCE_DIR}/docs/Doxyfile.in)
   set(DOXYGEN_CONFIG ${PROJECT_BINARY_DIR}/Doxyfile)
-  file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR})
   configure_file(${DOXYGEN_CONFIG_TEMPLATE} ${DOXYGEN_CONFIG})
   add_custom_command(
     OUTPUT ${DOXYGEN_INDEX_FILE}

data/ext/couchbase/cmake/OpenSSL.cmake

@@ -49,7 +49,7 @@ else()
       OPENSSL_USABLE ${CMAKE_CURRENT_BINARY_DIR}
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test_openssl.cxx
       LINK_LIBRARIES OpenSSL::SSL CXX_STANDARD 17)
-    if( OPENSSL_USABLE)
+    if(OPENSSL_USABLE)
       message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
       message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
       message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
@@ -60,7 +60,12 @@ else()
             "Cannot use OpenSSL ${OPENSSL_VERSION} at \"${OPENSSL_INCLUDE_DIR}\" and \"${OPENSSL_LIBRARIES}\". Will try to use from pkg-config."
         )
         find_package(PkgConfig REQUIRED)
-        pkg_check_modules(PKG_CONFIG_OPENSSL REQUIRED IMPORTED_TARGET GLOBAL openssl11)
+        pkg_check_modules(
+          PKG_CONFIG_OPENSSL
+          REQUIRED
+          IMPORTED_TARGET
+          GLOBAL
+          openssl11)
         if(PKG_CONFIG_OPENSSL_FOUND)
           message(STATUS "PKG_CONFIG_OPENSSL_VERSION: ${PKG_CONFIG_OPENSSL_VERSION}")
           message(STATUS "PKG_CONFIG_OPENSSL_INCLUDE_DIRS: ${PKG_CONFIG_OPENSSL_INCLUDE_DIRS}")
@@ -74,7 +79,12 @@ else()
     endif()
   elseif(UNIX)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(PKG_CONFIG_OPENSSL REQUIRED IMPORTED_TARGET GLOBAL openssl11)
+    pkg_check_modules(
+      PKG_CONFIG_OPENSSL
+      REQUIRED
+      IMPORTED_TARGET
+      GLOBAL
+      openssl11)
     if(PKG_CONFIG_OPENSSL_FOUND)
       message(STATUS "PKG_CONFIG_OPENSSL_VERSION: ${PKG_CONFIG_OPENSSL_VERSION}")
       message(STATUS "PKG_CONFIG_OPENSSL_INCLUDE_DIRS: ${PKG_CONFIG_OPENSSL_INCLUDE_DIRS}")
@@ -90,3 +100,88 @@ endif()
 # Read more at https://wiki.wireshark.org/TLS
 option(COUCHBASE_CXX_CLIENT_TLS_KEY_LOG_FILE
        "Path to file to write per-session secrets (Useful for Wireshark SSL/TLS dissection)")
+
+option(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE
+       "Download and embed Mozilla certificates from https://curl.se/ca/cacert.pem" TRUE)
+
+if(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE)
+  file(DOWNLOAD "https://curl.se/ca/cacert.pem.sha256" "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.sha256"
+       TLS_VERIFY ON)
+  file(READ "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.sha256" HASH_FILE_CONTENT)
+  string(
+    REGEX MATCH
+          "^([0-9a-f]+)"
+          COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256
+          ${HASH_FILE_CONTENT})
+  if(NOT COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256)
+    message(FATAL_ERROR "Failed to extract expected hash from file")
+  endif()
+  file(
+    DOWNLOAD "https://curl.se/ca/cacert.pem" "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.crt"
+    TLS_VERIFY ON
+    EXPECTED_HASH SHA256=${COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256})
+
+  file(READ "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.crt" CA_BUNDLE_CONTENT)
+  string(
+    REGEX MATCH
+          "Certificate data from Mozilla as of: ([^\n]*)"
+          CA_BUNDLE_DATE_LINE
+          ${CA_BUNDLE_CONTENT})
+  set(COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "${CMAKE_MATCH_1}")
+else()
+  set(CA_BUNDLE_CONTENT "")
+endif()
+
+set(CA_BUNDLE_CPP_FILE "${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx")
+
+# We parse CRT file because C++ does not allow string literals over 64k, and turning everything into bytes does not
+# seems to be cross-platform and fast.
+string(
+  REGEX MATCHALL
+        "[^=#]+=+\n-----BEGIN CERTIFICATE-----[^-]+-----END CERTIFICATE-----"
+        CERTIFICATES
+        "${CA_BUNDLE_CONTENT}")
+list(LENGTH CERTIFICATES NUMBER_OF_CERTIFICATES)
+file(
+  WRITE ${CA_BUNDLE_CPP_FILE}
+  "
+#include \"core/mozilla_ca_bundle.hxx\"
+
+namespace couchbase::core::default_ca
+{
+constexpr inline std::size_t number_of_certificates{ ${NUMBER_OF_CERTIFICATES} };
+constexpr inline certificate certificates[]{
+")
+foreach(CERTIFICATE ${CERTIFICATES})
+  string(
+    REGEX MATCH
+          "[ \t\r\n]*([^=\n]+)[ \t\r\n]*=+\n(-----BEGIN CERTIFICATE-----[^-]+-----END CERTIFICATE-----)"
+          PARTS
+          ${CERTIFICATE})
+  file(APPEND ${CA_BUNDLE_CPP_FILE} "    { R\"(${CMAKE_MATCH_1})\",\n      R\"(${CMAKE_MATCH_2})\" },\n\n")
+endforeach()
+
+file(
+  APPEND ${CA_BUNDLE_CPP_FILE}
+  "    { \"\", \"\" },
+};
+
+auto
+mozilla_ca_certs() -> gsl::span<const certificate>
+{
+    return { certificates, number_of_certificates };
+}
+
+auto
+mozilla_ca_certs_date() -> std::string_view
+{
+    return \"${COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE}\";
+}
+
+auto
+mozilla_ca_certs_sha256() -> std::string_view
+{
+    return \"${COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256}\";
+}
+} // namespace couchbase::core::default_ca
+")

data/ext/couchbase/cmake/Testing.cmake

@@ -17,7 +17,7 @@ macro(integration_test name)
     test_integration_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -25,6 +25,8 @@ macro(integration_test name)
   catch_discover_tests(
     test_integration_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "integration")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_INTEGRATION_TESTS "test_integration_${name}")
@@ -44,7 +46,7 @@ macro(transaction_test name)
     test_transaction_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -52,6 +54,8 @@ macro(transaction_test name)
   catch_discover_tests(
     test_transaction_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "transaction")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_TRANSACTION_TESTS "test_transaction_${name}")
@@ -70,7 +74,7 @@ macro(unit_test name)
     test_unit_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -78,6 +82,8 @@ macro(unit_test name)
   catch_discover_tests(
     test_unit_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "unit")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_UNIT_TESTS "test_unit_${name}")
@@ -96,7 +102,7 @@ macro(integration_benchmark name)
     benchmark_integration_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -104,6 +110,8 @@ macro(integration_benchmark name)
   catch_discover_tests(
     benchmark_integration_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "benchmark")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_BENCHMARKS "benchmark_integration_${name}")

data/ext/couchbase/cmake/ThirdPartyDependencies.cmake

@@ -18,6 +18,10 @@ set(PEGTL_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(PEGTL_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/snappy)
 set_target_properties(snappy PROPERTIES POSITION_INDEPENDENT_CODE ON)
+if(NOT MSVC)
+  # https://github.com/google/snappy/pull/156
+  target_compile_options(snappy PRIVATE -Wno-sign-compare)
+endif()
 
 set(HDR_LOG_REQUIRED OFF CACHE BOOL "" FORCE)
 set(HDR_HISTOGRAM_BUILD_SHARED OFF CACHE BOOL "" FORCE)

data/ext/couchbase/cmake/build_config.hxx.in

@@ -18,3 +18,6 @@
 #pragma once
 
 #cmakedefine TLS_KEY_LOG_FILE "@TLS_KEY_LOG_FILE@"
+#cmakedefine COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE
+#cmakedefine COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "@COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE@"
+#cmakedefine COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256 "@COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256@"

data/ext/couchbase/core/bucket.cxx

@@ -315,11 +315,12 @@ class bucket_impl
         }
         {
             std::scoped_lock lock(config_mutex_);
-            if (!config_->has_node_with_hostname(hostname)) {
+            if (!config_->has_node(origin_.options().network, service_type::key_value, origin_.options().enable_tls, hostname, port)) {
                 CB_LOG_TRACE(
-                  R"({} requested to restart session, but the node has been ejected from current configuration already. idx={}, address="{}:{}")",
+                  R"({} requested to restart session, but the node has been ejected from current configuration already. idx={}, network={}, address="{}:{}")",
                   log_prefix_,
                   index,
+                  origin_.options().network,
                   hostname,
                   port);
                 return;

data/ext/couchbase/core/bucket.hxx

@@ -106,6 +106,8 @@ class bucket
         } else {
             auto [partition, server] = map_id(cmd->request.id);
             if (!server.has_value()) {
+                CB_LOG_TRACE(
+                  R"({} unable to map key=\"{}\" to the node, id={}, partition={})", log_prefix(), cmd->request.id, cmd->id_, partition);
                 return io::retry_orchestrator::maybe_retry(
                   cmd->manager_, cmd, retry_reason::node_not_available, errc::common::request_canceled);
             }
@@ -114,9 +116,16 @@ class bucket
         }
         auto session = find_session_by_index(index);
         if (!session || !session->has_config()) {
+            CB_LOG_TRACE(R"({} defer operation id={}, session={}, has_config={})",
+                         log_prefix(),
+                         cmd->id_,
+                         session.has_value(),
+                         session.has_value() && session->has_config());
             return defer_command([self = shared_from_this(), cmd]() { self->map_and_send(cmd); });
         }
         if (session->is_stopped()) {
+            CB_LOG_TRACE(
+              R"({} the session has been found, but it is stopped, retrying id={}, session={})", log_prefix(), cmd->id_, session->id());
             return io::retry_orchestrator::maybe_retry(
               cmd->manager_, cmd, retry_reason::node_not_available, errc::common::request_canceled);
         }

data/ext/couchbase/core/cluster.hxx

@@ -33,6 +33,7 @@
 #include "diagnostics.hxx"
 #include "dispatcher.hxx"
 #include "impl/dns_srv_tracker.hxx"
+#include "mozilla_ca_bundle.hxx"
 #include "operations.hxx"
 #include "origin.hxx"
 
@@ -394,6 +395,21 @@ class cluster : public std::enable_shared_from_this<cluster>
                     CB_LOG_WARNING("[{}]: unable to load default CAs: {}", id_, ec.message());
                     // we don't consider this fatal and try to continue without it
                 }
+
+                if (const auto certificates = default_ca::mozilla_ca_certs();
+                    !origin_.options().disable_mozilla_ca_certificates && !certificates.empty()) {
+                    CB_LOG_DEBUG("[{}]: loading {} CA certificates from Mozilla bundle. Update date: \"{}\", SHA256: \"{}\"",
+                                 id_,
+                                 certificates.size(),
+                                 default_ca::mozilla_ca_certs_date(),
+                                 default_ca::mozilla_ca_certs_sha256());
+                    for (const auto& cert : certificates) {
+                        tls_.add_certificate_authority(asio::const_buffer(cert.body.data(), cert.body.size()), ec);
+                        if (ec) {
+                            CB_LOG_WARNING("[{}]: unable to load CA \"{}\" from Mozilla bundle: {}", id_, cert.authority, ec.message());
+                        }
+                    }
+                }
             } else { // trust certificate is explicitly specified
                 std::error_code ec{};
                 // load only the explicit certificate
@@ -430,6 +446,7 @@ class cluster : public std::enable_shared_from_this<cluster>
                     return close([ec, handler = std::forward<Handler>(handler)]() mutable { return handler(ec); });
                 }
             }
+
             session_ = io::mcbp_session(id_, ctx_, tls_, origin_, dns_srv_tracker_);
         } else {
             session_ = io::mcbp_session(id_, ctx_, origin_, dns_srv_tracker_);

data/ext/couchbase/core/cluster_options.cxx

@@ -16,7 +16,7 @@
  */
 
 #include "cluster_options.hxx"
-#include "config_profile.hxx"
+#include "config_profiles.hxx"
 #include <stdexcept>
 
 namespace couchbase::core
@@ -45,6 +45,6 @@ cluster_options::default_timeout_for(service_type type) const
 void
 cluster_options::apply_profile(std::string profile_name)
 {
-    couchbase::core::known_profiles().apply(profile_name, *this);
+    known_profiles().apply(profile_name, *this);
 }
 } // namespace couchbase::core

data/ext/couchbase/core/cluster_options.hxx

@@ -25,6 +25,7 @@
 #include "core/transactions/cleanup_testing_hooks.hxx"
 #include "service_type.hxx"
 #include "timeout_defaults.hxx"
+#include "tls_verify_mode.hxx"
 
 #include <couchbase/best_effort_retry_strategy.hxx>
 #include <couchbase/metrics/meter.hxx>
@@ -32,16 +33,10 @@
 #include <couchbase/transactions/transactions_config.hxx>
 
 #include <chrono>
-#include <list>
 #include <string>
 
 namespace couchbase::core
 {
-enum class tls_verify_mode {
-    none,
-    peer,
-};
-
 struct cluster_options {
     std::chrono::milliseconds bootstrap_timeout = timeout_defaults::bootstrap_timeout;
     std::chrono::milliseconds resolve_timeout = timeout_defaults::resolve_timeout;
@@ -53,7 +48,6 @@ struct cluster_options {
     std::chrono::milliseconds analytics_timeout = timeout_defaults::analytics_timeout;
     std::chrono::milliseconds search_timeout = timeout_defaults::search_timeout;
     std::chrono::milliseconds management_timeout = timeout_defaults::management_timeout;
-    std::chrono::milliseconds dns_srv_timeout = timeout_defaults::dns_srv_timeout;
 
     bool enable_tls{ false };
     std::string trust_certificate{};
@@ -87,6 +81,9 @@ struct cluster_options {
     couchbase::transactions::transactions_config::built transactions{};
 
     [[nodiscard]] std::chrono::milliseconds default_timeout_for(service_type type) const;
+
+    bool dump_configuration{ false };
+    bool disable_mozilla_ca_certificates{ false };
     void apply_profile(std::string profile_name);
 };
 

data/ext/couchbase/core/{config_profile.cxx → cluster_options_fwd.hxx}

@@ -15,11 +15,12 @@
  *   limitations under the License.
  */
 
-#include "config_profile.hxx"
+#pragma once
 
-couchbase::core::config_profiles&
-couchbase::core::known_profiles()
+namespace couchbase
 {
-    static couchbase::core::config_profiles profiles{};
-    return profiles;
-}
+namespace core
+{
+struct cluster_options;
+} // namespace core
+} // namespace couchbase

data/ext/couchbase/core/config_profile.hxx

@@ -16,13 +16,7 @@
  */
 #pragma once
 
-#include "cluster_options.hxx"
-#include <chrono>
-#include <fmt/core.h>
-#include <map>
-#include <mutex>
-#include <stdexcept>
-#include <string>
+#include "cluster_options_fwd.hxx"
 
 namespace couchbase::core
 {
@@ -32,61 +26,4 @@ class config_profile
     virtual ~config_profile() = default;
     virtual void apply(cluster_options&) = 0;
 };
-
-class development_profile : public config_profile
-{
-  public:
-    void apply(couchbase::core::cluster_options& opts) override
-    {
-        opts.key_value_timeout = std::chrono::milliseconds(20000); // 20 sec kv timeout.
-        opts.key_value_durable_timeout = std::chrono::milliseconds(20000); // 20 sec durable kv timeout.
-        opts.connect_timeout = std::chrono::milliseconds(20000);           // 20 sec connect timeout.
-        opts.view_timeout = std::chrono::milliseconds(120000);             // 2 minute view timeout
-        opts.query_timeout = std::chrono::milliseconds(120000);            // 2 minute query timeout
-        opts.analytics_timeout = std::chrono::milliseconds(120000);        // 2 minute analytics timeout
-        opts.search_timeout = std::chrono::milliseconds(120000);           // 2 minute search timeout
-        opts.management_timeout = std::chrono::milliseconds(120000);       // 2 minute management timeout
-    }
-};
-
-// this class just registers the known profiles defined above, and allows access to them.
-class config_profiles
-{
-  private:
-    std::map<std::string, std::shared_ptr<couchbase::core::config_profile>> profiles_;
-    std::mutex mut_;
-
-  public:
-    config_profiles() noexcept
-    {
-        // add all known profiles (above) to the map
-        register_profile<development_profile>("wan_development");
-    }
-
-    void apply(const std::string& profile_name, couchbase::core::cluster_options& opts)
-    {
-        std::lock_guard<std::mutex> lock(mut_);
-        auto it = profiles_.find(profile_name);
-        if (it != profiles_.end()) {
-            it->second->apply(opts);
-        } else {
-            throw std::invalid_argument(fmt::format("unknown profile '{}'", profile_name));
-        }
-    }
-
-    template<typename T, typename... Args>
-    void register_profile(const std::string& name, Args... args)
-    {
-        // This will just add it, doesn't look to see if it is overwriting an existing profile.
-        // TODO: perhaps add a template Args param?
-        // TODO: should we make this thread-safe?   Easy enough here, but we'd need to make the
-        //   singleton thread-safe too.
-        std::lock_guard<std::mutex> lock(mut_);
-        profiles_.emplace(std::make_pair(name, std::make_shared<T>(args...)));
-    }
-};
-
-config_profiles&
-known_profiles();
-
-} // namespace couchbase::core
+} // namespace couchbase::core