couchbase 3.0.2 → 3.0.3

data/ext/couchbase/operations/user_drop.hxx

@@ -19,22 +19,22 @@
 
 #include <tao/json.hpp>
 
-#include <version.hxx>
 #include <operations/rbac.hxx>
 #include <utils/url_codec.hxx>
+#include <version.hxx>
 
 namespace couchbase::operations
 {
 
 struct user_drop_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
 };
 
 struct user_drop_request {
     using response_type = user_drop_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::management;
 
@@ -52,18 +52,18 @@ struct user_drop_request {
 };
 
 user_drop_response
-make_response(std::error_code ec, user_drop_request& request, user_drop_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, user_drop_request&, user_drop_request::encoded_response_type&& encoded)
 {
-    user_drop_response response{ request.client_context_id, ec };
-    if (!ec) {
+    user_drop_response response{ ctx };
+    if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 200:
                 break;
             case 404:
-                response.ec = std::make_error_code(error::management_errc::user_not_found);
+                response.ctx.ec = std::make_error_code(error::management_errc::user_not_found);
                 break;
             default:
-                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
                 break;
         }
     }

data/ext/couchbase/operations/user_get.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -27,8 +27,7 @@ namespace couchbase::operations
 {
 
 struct user_get_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     rbac::user_and_metadata user{};
 };
 
@@ -36,6 +35,7 @@ struct user_get_request {
     using response_type = user_get_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::management;
 
@@ -54,20 +54,24 @@ struct user_get_request {
 };
 
 user_get_response
-make_response(std::error_code ec, user_get_request& request, user_get_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, user_get_request&, user_get_request::encoded_response_type&& encoded)
 {
-    user_get_response response{ request.client_context_id, ec };
-    if (!ec) {
+    user_get_response response{ ctx };
+    if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 200: {
-                tao::json::value payload = tao::json::from_string(encoded.body);
-                response.user = payload.as<rbac::user_and_metadata>();
+                try {
+                    response.user = tao::json::from_string(encoded.body).as<rbac::user_and_metadata>();
+                } catch (tao::json::pegtl::parse_error& e) {
+                    response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                    return response;
+                }
             } break;
             case 404:
-                response.ec = std::make_error_code(error::management_errc::user_not_found);
+                response.ctx.ec = std::make_error_code(error::management_errc::user_not_found);
                 break;
             default:
-                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
                 break;
         }
     }

data/ext/couchbase/operations/user_get_all.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -27,8 +27,7 @@ namespace couchbase::operations
 {
 
 struct user_get_all_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::vector<rbac::user_and_metadata> users{};
 };
 
@@ -36,6 +35,7 @@ struct user_get_all_request {
     using response_type = user_get_all_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::management;
 
@@ -53,17 +53,23 @@ struct user_get_all_request {
 };
 
 user_get_all_response
-make_response(std::error_code ec, user_get_all_request& request, user_get_all_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, user_get_all_request&, user_get_all_request::encoded_response_type&& encoded)
 {
-    user_get_all_response response{ request.client_context_id, ec };
-    if (!ec) {
+    user_get_all_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            tao::json::value payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             for (const auto& entry : payload.get_array()) {
                 response.users.emplace_back(entry.as<rbac::user_and_metadata>());
             }
         } else {
-            response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+            response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
         }
     }
     return response;

data/ext/couchbase/operations/user_upsert.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ namespace couchbase::operations
 {
 
 struct user_upsert_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::vector<std::string> errors{};
 };
 
@@ -40,6 +39,7 @@ struct user_upsert_request {
     using response_type = user_upsert_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::management;
 
@@ -98,16 +98,22 @@ struct user_upsert_request {
 };
 
 user_upsert_response
-make_response(std::error_code ec, user_upsert_request& request, user_upsert_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, user_upsert_request&, user_upsert_request::encoded_response_type&& encoded)
 {
-    user_upsert_response response{ request.client_context_id, ec };
-    if (!ec) {
+    user_upsert_response response{ ctx };
+    if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 200:
                 break;
             case 400: {
-                response.ec = std::make_error_code(error::common_errc::invalid_argument);
-                tao::json::value payload = tao::json::from_string(encoded.body);
+                tao::json::value payload{};
+                try {
+                    payload = tao::json::from_string(encoded.body);
+                } catch (tao::json::pegtl::parse_error& e) {
+                    response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                    return response;
+                }
+                response.ctx.ec = std::make_error_code(error::common_errc::invalid_argument);
                 const auto* errors = payload.find("errors");
                 if (errors != nullptr && errors->is_object()) {
                     for (const auto& entry : errors->get_object()) {
@@ -116,7 +122,7 @@ make_response(std::error_code ec, user_upsert_request& request, user_upsert_requ
                 }
             } break;
             default:
-                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
                 break;
         }
     }

data/ext/couchbase/operations/view_index_drop.hxx

@@ -22,14 +22,14 @@
 namespace couchbase::operations
 {
 struct view_index_drop_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
 };
 
 struct view_index_drop_request {
     using response_type = view_index_drop_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::views;
 
@@ -50,16 +50,16 @@ struct view_index_drop_request {
 };
 
 view_index_drop_response
-make_response(std::error_code ec, view_index_drop_request& request, view_index_drop_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, view_index_drop_request&, view_index_drop_request::encoded_response_type&& encoded)
 {
-    view_index_drop_response response{ request.client_context_id, ec };
-    if (!ec) {
+    view_index_drop_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
 
         } else if (encoded.status_code == 404) {
-            response.ec = std::make_error_code(error::view_errc::design_document_not_found);
+            response.ctx.ec = std::make_error_code(error::view_errc::design_document_not_found);
         } else {
-            response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+            response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
         }
     }
     return response;

data/ext/couchbase/operations/view_index_get.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
 namespace couchbase::operations
 {
 struct view_index_get_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     design_document document{};
 };
 
@@ -32,6 +31,7 @@ struct view_index_get_request {
     using response_type = view_index_get_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::views;
 
@@ -52,15 +52,21 @@ struct view_index_get_request {
 };
 
 view_index_get_response
-make_response(std::error_code ec, view_index_get_request& request, view_index_get_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, view_index_get_request& request, view_index_get_request::encoded_response_type&& encoded)
 {
-    view_index_get_response response{ request.client_context_id, ec };
-    if (!ec) {
+    view_index_get_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
             response.document.name = request.document_name;
             response.document.ns = request.name_space;
 
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             const auto* views = payload.find("views");
             if (views != nullptr && views->is_object()) {
                 for (const auto& view_entry : views->get_object()) {
@@ -80,9 +86,9 @@ make_response(std::error_code ec, view_index_get_request& request, view_index_ge
                 }
             }
         } else if (encoded.status_code == 404) {
-            response.ec = std::make_error_code(error::view_errc::design_document_not_found);
+            response.ctx.ec = std::make_error_code(error::view_errc::design_document_not_found);
         } else {
-            response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+            response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
         }
     }
     return response;

data/ext/couchbase/operations/view_index_get_all.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
 namespace couchbase::operations
 {
 struct view_index_get_all_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::vector<design_document> design_documents{};
 };
 
@@ -32,6 +31,7 @@ struct view_index_get_all_request {
     using response_type = view_index_get_all_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::management;
 
@@ -50,12 +50,18 @@ struct view_index_get_all_request {
 };
 
 view_index_get_all_response
-make_response(std::error_code ec, view_index_get_all_request& request, view_index_get_all_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, view_index_get_all_request& request, view_index_get_all_request::encoded_response_type&& encoded)
 {
-    view_index_get_all_response response{ request.client_context_id, ec };
-    if (!ec) {
+    view_index_get_all_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             auto* rows = payload.find("rows");
             if (rows != nullptr && rows->is_array()) {
                 for (const auto& entry : rows->get_array()) {
@@ -115,9 +121,9 @@ make_response(std::error_code ec, view_index_get_all_request& request, view_inde
                 }
             }
         } else if (encoded.status_code == 404) {
-            response.ec = std::make_error_code(error::common_errc::bucket_not_found);
+            response.ctx.ec = std::make_error_code(error::common_errc::bucket_not_found);
         } else {
-            response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+            response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
         }
     }
     return response;

data/ext/couchbase/operations/view_index_upsert.hxx

@@ -22,14 +22,14 @@
 namespace couchbase::operations
 {
 struct view_index_upsert_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
 };
 
 struct view_index_upsert_request {
     using response_type = view_index_upsert_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::views;
 
@@ -64,22 +64,22 @@ struct view_index_upsert_request {
 };
 
 view_index_upsert_response
-make_response(std::error_code ec, view_index_upsert_request& request, view_index_upsert_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, view_index_upsert_request&, view_index_upsert_request::encoded_response_type&& encoded)
 {
-    view_index_upsert_response response{ request.client_context_id, ec };
-    if (!ec) {
+    view_index_upsert_response response{ ctx };
+    if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 200:
             case 201:
                 break;
             case 400:
-                response.ec = std::make_error_code(error::common_errc::invalid_argument);
+                response.ctx.ec = std::make_error_code(error::common_errc::invalid_argument);
                 break;
             case 404:
-                response.ec = std::make_error_code(error::view_errc::design_document_not_found);
+                response.ctx.ec = std::make_error_code(error::view_errc::design_document_not_found);
                 break;
             default:
-                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
         }
     }
     return response;

data/ext/couchbase/origin.hxx

@@ -28,6 +28,7 @@ struct cluster_credentials {
     std::string password{};
     std::string certificate_path{};
     std::string key_path{};
+    std::vector<std::string> allowed_sasl_mechanisms{};
 
     [[nodiscard]] bool uses_certificate() const
     {

data/ext/couchbase/platform/terminate_handler.cc

@@ -63,7 +63,7 @@ log_backtrace()
 {
     static const char format_str[] = "Call stack:\n%s";
 
-    char buffer[4096];
+    char buffer[8192];
     if (print_backtrace_to_buffer("    ", buffer, sizeof(buffer))) {
         spdlog::critical("Call stack:\n{}", buffer);
     } else {
@@ -72,7 +72,7 @@ log_backtrace()
         fprintf(stderr, format_str, "");
         print_backtrace_to_file(stderr);
         fflush(stderr);
-        spdlog::critical("Call stack exceeds 4k");
+        spdlog::critical("Call stack exceeds 8k, rendered to STDERR");
     }
 }
 
@@ -81,11 +81,15 @@ log_backtrace()
 static void
 backtrace_terminate_handler()
 {
-    spdlog::critical(R"(*** Fatal error encountered during exception handling (rev="{}", compiler="{}", system="{}", date="{}")***)",
-                     BACKEND_GIT_REVISION,
-                     BACKEND_CXX_COMPILER,
-                     BACKEND_SYSTEM,
-                     BACKEND_BUILD_TIMESTAMP);
+    static bool meta_reported = false;
+    if (!meta_reported) {
+        spdlog::critical(R"(*** Fatal error encountered during exception handling (rev="{}", compiler="{}", system="{}", date="{}") ***)",
+                         BACKEND_GIT_REVISION,
+                         BACKEND_CXX_COMPILER,
+                         BACKEND_SYSTEM,
+                         BACKEND_BUILD_TIMESTAMP);
+        meta_reported = true;
+    }
     log_handled_exception();
 
     if (should_include_backtrace) {
@@ -94,7 +98,7 @@ backtrace_terminate_handler()
 
     // Chain to the default handler if available (as it may be able to print
     // other useful information on why we were told to terminate).
-    if (default_terminate_handler != nullptr) {
+    if (default_terminate_handler != nullptr && default_terminate_handler != backtrace_terminate_handler) {
         default_terminate_handler();
     }