couchbase 4.2.3 → 4.2.4

package/deps/couchbase-cxx-client/bin/travel-sample-index.json

@@ -0,0 +1,188 @@
+{
+    "type": "fulltext-index",
+    "name": "travel-sample-index",
+    "sourceType": "gocbcore",
+    "sourceName": "travel-sample",
+    "planParams": {
+        "maxPartitionsPerPIndex": 1024,
+        "indexPartitions": 1
+    },
+    "params": {
+        "doc_config": {
+            "docid_prefix_delim": "",
+            "docid_regexp": "",
+            "mode": "scope.collection.type_field",
+            "type_field": "type"
+        },
+        "mapping": {
+            "analysis": {},
+            "default_analyzer": "standard",
+            "default_datetime_parser": "dateTimeOptional",
+            "default_field": "_all",
+            "default_mapping": {
+                "dynamic": false,
+                "enabled": false
+            },
+            "default_type": "_default",
+            "docvalues_dynamic": false,
+            "index_dynamic": false,
+            "store_dynamic": false,
+            "type_field": "_type",
+            "types": {
+                "inventory.airline": {
+                    "dynamic": false,
+                    "enabled": true,
+                    "properties": {
+                        "country": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "fields": [
+                                {
+                                    "analyzer": "keyword",
+                                    "docvalues": true,
+                                    "index": true,
+                                    "name": "country",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "name": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "fields": [
+                                {
+                                    "analyzer": "en",
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "name",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        }
+                    }
+                },
+                "inventory.hotel": {
+                    "dynamic": false,
+                    "enabled": true,
+                    "properties": {
+                        "city": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "fields": [
+                                {
+                                    "analyzer": "en",
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "city",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "country": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "fields": [
+                                {
+                                    "analyzer": "keyword",
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "country",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "description": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "fields": [
+                                {
+                                    "analyzer": "en",
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "description",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        },
+                        "reviews": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "properties": {
+                                "content": {
+                                    "dynamic": false,
+                                    "enabled": true,
+                                    "fields": [
+                                        {
+                                            "analyzer": "en",
+                                            "docvalues": true,
+                                            "include_in_all": true,
+                                            "include_term_vectors": true,
+                                            "index": true,
+                                            "name": "content",
+                                            "store": true,
+                                            "type": "text"
+                                        }
+                                    ]
+                                },
+                                "ratings": {
+                                    "dynamic": false,
+                                    "enabled": true,
+                                    "properties": {
+                                        "Overall": {
+                                            "dynamic": false,
+                                            "enabled": true,
+                                            "fields": [
+                                                {
+                                                    "docvalues": true,
+                                                    "include_in_all": true,
+                                                    "index": true,
+                                                    "name": "Overall",
+                                                    "store": true,
+                                                    "type": "number"
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "title": {
+                            "dynamic": false,
+                            "enabled": true,
+                            "fields": [
+                                {
+                                    "analyzer": "en",
+                                    "docvalues": true,
+                                    "include_in_all": true,
+                                    "include_term_vectors": true,
+                                    "index": true,
+                                    "name": "title",
+                                    "store": true,
+                                    "type": "text"
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "store": {
+            "indexType": "scorch",
+            "segmentVersion": 15
+        }
+    },
+    "sourceParams": {}
+}

package/deps/couchbase-cxx-client/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}

package/deps/couchbase-cxx-client/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
+")

package/deps/couchbase-cxx-client/cmake/Testing.cmake

@@ -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}")
@@ -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}")
@@ -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}")
@@ -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}")

package/deps/couchbase-cxx-client/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@"