couchbase 3.2.2 → 3.2.5

package/binding.gyp

@@ -67,6 +67,11 @@
                     '-pedantic',
                     '-std=gnu99',
                 ]
+            }],
+            ['OS=="linux"', {
+                "libraries": [
+                    '-static-libgcc -static-libstdc++',
+                ]
             }]
         ],
         'sources': [

package/deps/lcb/CMakeLists.txt

@@ -30,7 +30,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
 # Couchbase mock path to download
 SET(COUCHBASE_MOCK_VERSION 1.5.25)
 SET(COUCHBASE_MOCK_URL "https://github.com/couchbase/CouchbaseMock/releases/download/${COUCHBASE_MOCK_VERSION}/CouchbaseMock-${COUCHBASE_MOCK_VERSION}.jar")
-project(libcouchbase VERSION 3.2.1 LANGUAGES C CXX)
+project(libcouchbase VERSION 3.2.5 LANGUAGES C CXX)
 
 if (NOT CMAKE_VERSION VERSION_LESS "3.13")
     # CMP0077: option() honors normal variables

package/deps/lcb/CONTRIBUTING.md

@@ -66,7 +66,7 @@ Add your public SSH key to gerrit before submitting.
 Assuming you have a repository created like so:
 
 ```
-$ git clone git://github.com/couchbase/libcouchbase.git
+$ git clone https://github.com/couchbase/libcouchbase.git
 ```
 
 you can simply perform two simple steps to get started with gerrit:

package/deps/lcb/README.markdown

@@ -48,7 +48,7 @@ Provided is a convenience script called `cmake/configure`. It is a Perl
 script and functions like a normal `autotools` script.
 
 ```shell
-$ git clone git://github.com/couchbase/libcouchbase.git
+$ git clone https://github.com/couchbase/libcouchbase.git
 $ cd libcouchbase && mkdir build && cd build
 $ ../cmake/configure
 $ make
@@ -60,7 +60,7 @@ $ ctest
 Assuming `git` and Visual Studio 2010 are installed, from a `CMD` shell, do:
 
 ```
-C:\> git clone git://github.com/couchbase/libcouchbase.git
+C:\> git clone https://github.com/couchbase/libcouchbase.git
 C:\> mkdir lcb-build
 C:\> cd lcb-build
 C:\> cmake -G "Visual Studio 10" ..\libcouchbase

package/deps/lcb/RELEASE_NOTES.markdown

@@ -1,15 +1,82 @@
 # Release Notes
 
+## 3.2.5 (2022-02-08)
+
+CCBC-1486: Add support for preserve expiry to query options
+CCBC-1534, CCBC-1411: improve query error handling
+CCBC-1519: pass extra privilege with KV "on-behalf-of".
+CCBC-1521: fix bootstrap process when client cert is used and error map is supported. If client cert auth is used, once
+the error map response has been received, the negotiation is complete.
+CCBC-1529: load authentication certificate as chain file.
+CCBC-1525: remove stringstream in `collection_qualifier`. Constructing a stringstream object every time
+`collection_qualifier` is constructed is very expensive.
+CCBC-1528: update parsing of "quota limit" error for FTS
+
+## 3.2.4 (2021-11-23)
+
+CCBC-1522: Filter `DnsQuery` results on Windows by type: only use records with `DNS_TYPE_SRV` type.
+
+CCBC-1521: Fixed bootstrap process when client certificate is used. We always pipeline error map request with `HELLO`
+request, and usually await for `hello`+`error_map` responses, because after that goes SASL authentication (and then
+optional selection of the bucket) which cannot be completely pipelined. But in case of client certificate, we might
+terminate bootstrap process too early if the bootstrap process does not require immediate selection of the bucket.
+    
+CCBC-1432: Support for rate limiting error codes: `LCB_ERR_RATE_LIMITED` and `LCB_ERR_QUOTA_LIMITED`.
+
+CCBC-1514: Do not translate unknown error with "item-only" attribute into `LCB_ERR_CAS_MISMATCH`.
+
+CCBC-1515: Performance optimization: replace `sstream` with string `append()`. Only if list of IO vectors supplied for
+value in mutation operations.
+
+## 3.2.3 (2021-10-20)
+
+* CCBC-1484: Fixed tracing tags in accordance to RFC.
+
+* CCBC-1510: Fixed key length calculation for exists/get/touch/unlock.
+
+* CCBC-1495: Fixed payload encoding in query index management helpers. Query index management helpers now explicitly
+  declared deperecated.
+
+* CCBC-1506: Duration values now accepted golang style encoding. Connection string and `lcb_cntl_string` now can parse
+  strings with duration encoded in golang style, e.g. `analytics_timeout=5s42us`. The result still converted into 32-bit
+  value with microsecond resolution.
+
+* Improved test coverage, stability and documentation.
+
+## 3.2.2 (2021-09-22)
+
+* CCBC-1485: Allow disabling tracer for connected instance.
+
+* CCBC-1472: Ensure strict JSON parsing mode for query meta.
+
+* CCBC-1494: Disconnect logger after `lcb_destroy` invoked to avoid double free errors.
+
+* CCBC-1457: improve error message when server enforces encryption
+
+* CCBC-1489: Fixed get_and_touch to use the correct expiry.
+
+* CCBC-1487: Fixed `retryq` erasing already sent packets.
+
+* CCBC-1488: Fixed incorrect refcounting in `Connstart`.
+
+* CCBC-1479: Initialize fields of custom tracer struct.
+
+* CCBC-1478: Do not retry successful query with empty result.
+
+* CCBC-1216: Implement user impersonation API
+
+* Improved test coverage and stability.
+
 ## 3.2.1 (2021-08-20)
 
 * CCBC-1429: Fixed positional parameters for query/analtyics:
-    
+
   * reverts behaviour `lcb_cmdquery_positional_param` and `lcb_cmdanalytics_positional_param` to append single
     JSON-encoded value to arguments array.
-    
+
   * introduces new functions `lcb_cmdquery_positional_params` and `lcb_cmdanalytics_positional_params` that accept all
     positional arguments at once as JSON-encoded array.
-    
+
   * document, that old functions will emit compiler warning since 3.3.0 release and will be removed later.
 
 * CCBC-1428: Clear callback upon error in `lcb_search`.
@@ -35,56 +102,56 @@
 * Various improvements and fixes in test and build infrastruture
 
 * CBCC-1280 Support for OpenTelemetry tracing.
-    
+
   Tracing updated to allow for an external tracer that creates and finishes spans, adds tags, destroys spans.  Also,
   spans now have the notion of being the 'outer' span.  That is the span that has all the outer span tags, and is the
   one whose duration is used to determine whether or not the operation has exceeded the threshold if the
   ThresholdLoggingTracer is used.
-    
+
   If you pass in a parent that is an outer span, you must call `lcbtrace_span_finish` yourself. When an operation
   begins, if there is no parent span passed in, or if there is but it isn't an 'outer' span, then the operation creates
   the outer span itself.
   See `/examples/tracing/otel_tracing.cc` for an example.
-    
+
 * CCBC-1362: Support for metrics.
-    
+
    When enabled, by default will output a histogram of latencies for various kv operations plus query, search, analytics
    and view queries.
-    
+
   If desired, an external metrics collector can be passed in when the instance is created, which will then be called
   with latencies for each operation.  This can be used to call into an opentelemetry meter for aggregation and export.
   See `/examples/metrics/otel_metrics.cc` for an example.
 
 * CCBC-1421: Allow empty path for subdocument array methods.
-    
+
 * CCBC-1417: Depecate CAS usage with counter operation.
 
 * CCBC-1418: Map query error 13014 to `LCB_ERR_AUTHENTICATION_FAILURE`.
-    
+
 * CCBC-1357: Allow to preserve expiration with Replace, Upsert and MutateIn operations.
 
 * CCBC-1384: Allow the operations to be deferred until the instance will be connected to cluster.
 
 * CCBC-1410: Refactor dynamic authenticator. NOTE: this API still volatile and might be changed in future.
-    
+
   In order to improve UX and allow caller to implement credential caching the API for authenticator was revised:
-    
+
     * instead of separate callbacks for username/password, now it uses single callback
-    
+
     * in the callback, the caller can figure out the reason of credentials request using `lcbauth_credentials_reason()`
-    
+
     * the caller can signal that it failed to retrieve credentials from external provider, and set result with
       `lcbauth_credentials_result()`. In this case the SDK will not retry the operation.
-    
+
 
 * CCBC-1413: Skip `SELECT_BUCKET` packets waiting retry queue.
 
 * CCBC-1169: Request copy from active vbucket for `get_all_replicas` operation.
 
 * CCBC-1406: Fill in prepared statement handle on retry.
-    
+
 * CCBC-1405: Remove const from command cookie.
-    
+
 * CCBC-1402: Fix parsing JSON primitives as query rows.
 
 ## 3.1.3 (2021-05-10)

package/deps/lcb/cmake/Modules/GetVersionInfo.cmake

@@ -65,7 +65,7 @@ IF(APPLE)
 ELSE()
     SET(LCB_SONAME_MAJOR "8")
 ENDIF()
-SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.2")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.6")
 
 MESSAGE(STATUS "libcouchbase ${LCB_VERSION_MAJOR},${LCB_VERSION_MINOR},${LCB_VERSION_PATCH}")
 MESSAGE(STATUS "Building libcouchbase ${LCB_VERSION}/${LCB_VERSION_CHANGESET}")

package/deps/lcb/contrib/cbsasl/src/scram-sha/scram_utils.cc

@@ -16,8 +16,8 @@
 
 #include "scram_utils.h"
 #include "config.h"
-#include <time.h>
-#include <ctype.h>
+#include <ctime>
+#include <cctype>
 #include "strcodecs/strcodecs.h"
 
 #ifndef LCB_NO_SSL
@@ -46,9 +46,9 @@ void seed_rand(void)
     // The entropy of these values is not good, but that's enough for generating nonces.
 
 #ifdef LCB_NO_SSL
-    srand(time(NULL));
+    srand(time(nullptr));
 #else
-    time_t current_time = time(NULL);
+    time_t current_time = time(nullptr);
     clock_t clk;
 #ifdef _WIN32
     int pid;
@@ -73,7 +73,7 @@ void seed_rand(void)
  */
 void generate_nonce(char *buffer, int buffer_length)
 {
-    if ((NULL == buffer) || (0 == buffer_length)) {
+    if ((nullptr == buffer) || (0 == buffer_length)) {
         // invalid input arguments
         return;
     }
@@ -88,14 +88,13 @@ void generate_nonce(char *buffer, int buffer_length)
         int aRandom = 0;
         unsigned int aMaxRandBits = 0, aRandRange,
                      aMaxRand = RAND_MAX; // we have to compute how many bits the rand() function can return
-        int i;
         while (aMaxRand >>= 1) {
             aMaxRandBits++;
         }
         aRandRange = aMaxRandBits / 8; // number of bytes we can extract from a rand() value.
         // To avoid generating a new random number for each character, we call rand() only once every 5 characters.
         // A 32-bits integer can give 5 values of 6 bits.
-        for (i = 0; i < buffer_length; ++i) {
+        for (int i = 0; i < buffer_length; ++i) {
             if (i % aRandRange == 0) {
                 // we refill aRandom
                 aRandom = rand();
@@ -115,8 +114,7 @@ void generate_nonce(char *buffer, int buffer_length)
 int compute_special_chars(const char *buffer, int buffer_length)
 {
     int result = 0;
-    int i;
-    for (i = 0; i < buffer_length; ++i) {
+    for (int i = 0; i < buffer_length; ++i) {
         char c = buffer[i];
         if (iscntrl(c)) {
             return -1; // control characters are not allowed
@@ -140,13 +138,12 @@ int compute_special_chars(const char *buffer, int buffer_length)
 void usernmcpy(char *dest, const char *src, size_t n)
 {
     char *newdest = dest;
-    unsigned int i;
 
-    if (NULL == dest || NULL == src || 0 == n) {
+    if (nullptr == dest || nullptr == src || 0 == n) {
         return; // invalid arguments
     }
 
-    for (i = 0; i < n; ++i) {
+    for (size_t i = 0; i < n; ++i) {
         char c = src[i];
         switch (c) {
             case '=':
@@ -178,7 +175,7 @@ cbsasl_error_t parse_server_challenge(const char *serverin, unsigned int serveri
     const char *oldptr = serverin;
     unsigned int remainlen = serverinlen;
 
-    if (NULL == serverin || 0 == serverinlen) {
+    if (nullptr == serverin || 0 == serverinlen) {
         return SASL_BADPARAM;
     }
 
@@ -186,7 +183,7 @@ cbsasl_error_t parse_server_challenge(const char *serverin, unsigned int serveri
     do {
         unsigned int attrlen; // attribute length
         ptr = static_cast<const char *>(memchr(ptr, ',', remainlen));
-        if (ptr != NULL) {
+        if (ptr != nullptr) {
             // oldptr points to the beginning of the attribute
             // Ex: "r=xxxxx,s=zzzzzz,i=10"
             //      ^      ^
@@ -209,7 +206,7 @@ cbsasl_error_t parse_server_challenge(const char *serverin, unsigned int serveri
         }
         switch (oldptr[0]) {
             case 'r': // nonce
-                if (*nonce != NULL) {
+                if (*nonce != nullptr) {
                     // it looks like we already stored a previous occurrence of the nonce attribute
                     return SASL_BADPARAM;
                 }
@@ -217,7 +214,7 @@ cbsasl_error_t parse_server_challenge(const char *serverin, unsigned int serveri
                 *noncelength = attrlen - 2;
                 break;
             case 's': // salt
-                if (*salt != NULL) {
+                if (*salt != nullptr) {
                     // it looks like we already stored a previous occurrence of the salt attribute
                     return SASL_BADPARAM;
                 }
@@ -244,7 +241,7 @@ cbsasl_error_t parse_server_challenge(const char *serverin, unsigned int serveri
 
         remainlen = remainlen - attrlen - 1;
         oldptr = ptr;
-    } while (ptr != NULL);
+    } while (ptr != nullptr);
 
     return SASL_OK;
 }
@@ -313,17 +310,17 @@ static cbsasl_error_t HMAC_digest(cbsasl_auth_mechanism_t auth_mech, const unsig
 {
     switch (auth_mech) {
         case SASL_AUTH_MECH_SCRAM_SHA1:
-            if (HMAC(EVP_sha1(), key, keylen, data, datalen, digest, digestlen) == NULL) {
+            if (HMAC(EVP_sha1(), key, keylen, data, datalen, digest, digestlen) == nullptr) {
                 return SASL_FAIL;
             }
             break;
         case SASL_AUTH_MECH_SCRAM_SHA256:
-            if (HMAC(EVP_sha256(), key, keylen, data, datalen, digest, digestlen) == NULL) {
+            if (HMAC(EVP_sha256(), key, keylen, data, datalen, digest, digestlen) == nullptr) {
                 return SASL_FAIL;
             }
             break;
         case SASL_AUTH_MECH_SCRAM_SHA512:
-            if (HMAC(EVP_sha512(), key, keylen, data, datalen, digest, digestlen) == NULL) {
+            if (HMAC(EVP_sha512(), key, keylen, data, datalen, digest, digestlen) == nullptr) {
                 return SASL_FAIL;
             }
             break;
@@ -369,19 +366,19 @@ cbsasl_error_t compute_client_proof(cbsasl_auth_mechanism_t auth_mech, const uns
     unsigned int storedkeylen = 0;
     switch (auth_mech) {
         case SASL_AUTH_MECH_SCRAM_SHA1:
-            if (SHA1(clientkeyhmac, hmaclen, storedkey) == NULL) {
+            if (SHA1(clientkeyhmac, hmaclen, storedkey) == nullptr) {
                 return SASL_FAIL;
             }
             storedkeylen = SHA_DIGEST_LENGTH;
             break;
         case SASL_AUTH_MECH_SCRAM_SHA256:
-            if (SHA256(clientkeyhmac, hmaclen, storedkey) == NULL) {
+            if (SHA256(clientkeyhmac, hmaclen, storedkey) == nullptr) {
                 return SASL_FAIL;
             }
             storedkeylen = SHA256_DIGEST_LENGTH;
             break;
         case SASL_AUTH_MECH_SCRAM_SHA512:
-            if (SHA512(clientkeyhmac, hmaclen, storedkey) == NULL) {
+            if (SHA512(clientkeyhmac, hmaclen, storedkey) == nullptr) {
                 return SASL_FAIL;
             }
             storedkeylen = SHA512_DIGEST_LENGTH;
@@ -396,7 +393,7 @@ cbsasl_error_t compute_client_proof(cbsasl_auth_mechanism_t auth_mech, const uns
     //                   client-final-message-without-proof
     unsigned int authmesslen = cfblen + 1 + sfmlen + 1 + cfwplen;
     char *authmess = static_cast<char *>(calloc(authmesslen + 1, 1)); // +1 for the binary zero
-    if (NULL == authmess) {
+    if (nullptr == authmess) {
         return SASL_NOMEM;
     }
     memcpy(authmess, clientfirstbare, cfblen);
@@ -419,8 +416,7 @@ cbsasl_error_t compute_client_proof(cbsasl_auth_mechanism_t auth_mech, const uns
     // final step:
     // ClientProof     := ClientKey XOR ClientSignature
     char clientproof[EVP_MAX_MD_SIZE]; // binary client proof
-    unsigned int i;
-    for (i = 0; i < clientsignlen; ++i) {
+    for (unsigned i = 0; i < clientsignlen; ++i) {
         clientproof[i] = clientkeyhmac[i] ^ clientsign[i];
     }
 

package/deps/lcb/contrib/lcb-jsoncpp/lcb-jsoncpp.cpp

@@ -288,6 +288,7 @@ bool Reader::parse(const char* beginDoc,
                    const char* endDoc,
                    Value& root,
                    bool collectComments) {
+  try {
   if (!features_.allowComments_) {
     collectComments = false;
   }
@@ -324,6 +325,21 @@ bool Reader::parse(const char* beginDoc,
     }
   }
   return successful;
+  } catch (const RuntimeError &e) {
+      Token token;
+      token.type_ = tokenError;
+      token.start_ = beginDoc;
+      token.end_ = endDoc;
+      addError(std::string("RuntimeError: ") + e.what(), token);
+      return false;
+  } catch (const LogicError &e) {
+      Token token;
+      token.type_ = tokenError;
+      token.start_ = beginDoc;
+      token.end_ = endDoc;
+      addError(std::string("LogicError: ") + e.what(), token);
+      return false;
+  }
 }
 
 bool Reader::readValue() {
@@ -2356,15 +2372,13 @@ RuntimeError::RuntimeError(std::string const& msg)
 LogicError::LogicError(std::string const& msg)
   : Exception(msg)
 {}
-void throwRuntimeError(std::string const& )
+void throwRuntimeError(std::string const& msg)
 {
-    assert(false);
-//  throw RuntimeError(msg);
+    throw RuntimeError(msg);
 }
-void throwLogicError(std::string const&)
+void throwLogicError(std::string const& msg)
 {
-    assert(false);
-//  throw LogicError(msg);
+    throw LogicError(msg);
 }
 
 // //////////////////////////////////////////////////////////////////

package/deps/lcb/doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Couchbase C Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.2.1
+PROJECT_NUMBER         = 3.2.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

package/deps/lcb/example/minimal/query.c

@@ -71,7 +71,7 @@ static void row_callback(lcb_INSTANCE *instance, int type, const lcb_RESPQUERY *
 
     lcb_respquery_row(resp, &row, &nrow);
     ln2space(row, nrow);
-    fprintf(stderr, "[\x1b[%dmQUERY\x1b[0m] %s, (%d) %.*s\n", err2color(rc), lcb_strerror_short(rc), (int)nrow,
+    fprintf(stderr, "[\x1b[%dmQUERY\x1b[0m] %s, (size=%d) %.*s\n", err2color(rc), lcb_strerror_short(rc), (int)nrow,
             (int)nrow, row);
     if (lcb_respquery_is_final(resp)) {
         fprintf(stderr, "\n");
@@ -120,7 +120,6 @@ static void sigint_handler(int unused)
 
 int main(int argc, char *argv[])
 {
-    lcb_STATUS err;
     lcb_INSTANCE *instance;
     char *bucket = NULL;
     const char *key = "user:king_arthur";
@@ -171,11 +170,14 @@ int main(int argc, char *argv[])
     }
 
     {
-        lcb_CMDN1XMGMT cmd = {0};
-        cmd.callback = idx_callback;
-        cmd.spec.flags = LCB_N1XSPEC_F_PRIMARY;
-        cmd.spec.ixtype = LCB_N1XSPEC_T_GSI;
-        check(lcb_n1x_create(instance, NULL, &cmd), "schedule N1QL index creation operation");
+        lcb_CMDQUERY *cmd;
+        char query[1024] = {0};
+        lcb_cmdquery_create(&cmd);
+        snprintf(query, sizeof(query), "CREATE PRIMARY INDEX ON `%s` USING gsi", bucket);
+        check(lcb_cmdquery_statement(cmd, query, strlen(query)), "set QUERY statement");
+        lcb_cmdquery_callback(cmd, row_callback);
+        check(lcb_query(instance, NULL, cmd), "schedule QUERY INDEX create operation");
+        lcb_cmdquery_destroy(cmd);
         lcb_wait(instance, LCB_WAIT_DEFAULT);
     }
 

package/deps/lcb/gyp_config/common/libcouchbase/configuration.h

@@ -33,7 +33,7 @@
  */
 
 /** @brief libcouchbase version string */
-#define LCB_VERSION_STRING "3.2.1+13-njs"
+#define LCB_VERSION_STRING "3.2.5-njs"
 
 /**@brief libcouchbase hex version
  *
@@ -50,12 +50,12 @@
  * 2.1.3	| 0x020103
  * 3.0.15	| 0x030015
  */
-#define LCB_VERSION 0x030201
+#define LCB_VERSION 0x030205
 
 /**@brief The SCM revision ID
  * @see LCB_CNTL_CHANGESET
  */
-#define LCB_VERSION_CHANGESET "204a528618e9a86007b85c109fd46a45c21aa053"
+#define LCB_VERSION_CHANGESET "e4de408c96550b48745b3a142d9827c898d4e96f"
 
 /**@brief The client ID
  */