couchbase 3.0.2 → 3.0.3

data/ext/couchbase/io/mcbp_session.hxx

@@ -126,7 +126,7 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
           : session_(session)
           , sasl_([origin = session_->origin_]() -> std::string { return origin.username(); },
                   [origin = session_->origin_]() -> std::string { return origin.password(); },
-                  { "SCRAM-SHA512", "SCRAM-SHA256", "SCRAM-SHA1", "PLAIN" })
+                  session_->origin_.credentials().allowed_sasl_mechanisms)
         {
             tao::json::value user_agent{
                 { "a", couchbase::sdk_id() },
@@ -545,11 +545,17 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
 
     std::string remote_address() const
     {
+        if (endpoint_.protocol() == asio::ip::tcp::v6()) {
+            return fmt::format("[{}]:{}", endpoint_address_, endpoint_.port());
+        }
         return fmt::format("{}:{}", endpoint_address_, endpoint_.port());
     }
 
     std::string local_address() const
     {
+        if (endpoint_.protocol() == asio::ip::tcp::v6()) {
+            return fmt::format("[{}]:{}", local_endpoint_address_, local_endpoint_.port());
+        }
         return fmt::format("{}:{}", local_endpoint_address_, local_endpoint_.port());
     }
 
@@ -1001,7 +1007,7 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
             }
             if (config_->rev && config.rev) {
                 if (*config_->rev == *config.rev) {
-                    spdlog::debug("{} received a configuration with identical revision (rev={}), ignoring", log_prefix_, *config.rev);
+                    spdlog::trace("{} received a configuration with identical revision (rev={}), ignoring", log_prefix_, *config.rev);
                     return;
                 }
                 if (*config_->rev > *config.rev) {

data/ext/couchbase/io/retry_context.hxx

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <set>
 #include <chrono>
+#include <set>
 
 #include <io/retry_reason.hxx>
 #include <io/retry_strategy.hxx>

data/ext/couchbase/operations/analytics_dataset_create.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.
@@ -19,6 +19,7 @@
 
 #include <tao/json.hpp>
 
+#include <error_context/http.hxx>
 #include <version.hxx>
 
 namespace couchbase::operations
@@ -29,8 +30,7 @@ struct analytics_dataset_create_response {
         std::string message;
     };
 
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::vector<problem> errors{};
 };
@@ -39,6 +39,7 @@ struct analytics_dataset_create_request {
     using response_type = analytics_dataset_create_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::analytics;
 
@@ -53,7 +54,7 @@ struct analytics_dataset_create_request {
 
     bool ignore_if_exists{ false };
 
-    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context&)
+    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& /* context */)
     {
         std::string where_clause = condition ? fmt::format("WHERE {}", *condition) : "";
         std::string if_not_exists_clause = ignore_if_exists ? "IF NOT EXISTS" : "";
@@ -72,13 +73,19 @@ struct analytics_dataset_create_request {
 };
 
 analytics_dataset_create_response
-make_response(std::error_code ec,
-              analytics_dataset_create_request& request,
+make_response(error_context::http&& ctx,
+              analytics_dataset_create_request& /* request */,
               analytics_dataset_create_request::encoded_response_type&& encoded)
 {
-    analytics_dataset_create_response response{ request.client_context_id, ec };
-    if (!ec) {
-        auto payload = tao::json::from_string(encoded.body);
+    analytics_dataset_create_response response{ ctx };
+    if (!response.ctx.ec) {
+        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.status = payload.at("status").get_string();
 
         if (response.status != "success") {
@@ -104,11 +111,11 @@ make_response(std::error_code ec,
                 }
             }
             if (dataset_exists) {
-                response.ec = std::make_error_code(error::analytics_errc::dataset_exists);
+                response.ctx.ec = std::make_error_code(error::analytics_errc::dataset_exists);
             } else if (link_not_found) {
-                response.ec = std::make_error_code(error::analytics_errc::link_not_found);
+                response.ctx.ec = std::make_error_code(error::analytics_errc::link_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);
             }
         }
     }

data/ext/couchbase/operations/analytics_dataset_drop.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.
@@ -29,8 +29,7 @@ struct analytics_dataset_drop_response {
         std::string message;
     };
 
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::vector<problem> errors{};
 };
@@ -39,6 +38,7 @@ struct analytics_dataset_drop_request {
     using response_type = analytics_dataset_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::analytics;
 
@@ -50,7 +50,7 @@ struct analytics_dataset_drop_request {
 
     bool ignore_if_does_not_exist{ false };
 
-    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context&)
+    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& /* context */)
     {
         std::string if_exists_clause = ignore_if_does_not_exist ? "IF EXISTS" : "";
 
@@ -66,11 +66,19 @@ struct analytics_dataset_drop_request {
 };
 
 analytics_dataset_drop_response
-make_response(std::error_code ec, analytics_dataset_drop_request& request, analytics_dataset_drop_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx,
+              analytics_dataset_drop_request& /* request */,
+              analytics_dataset_drop_request::encoded_response_type&& encoded)
 {
-    analytics_dataset_drop_response response{ request.client_context_id, ec };
-    if (!ec) {
-        auto payload = tao::json::from_string(encoded.body);
+    analytics_dataset_drop_response response{ ctx };
+    if (!response.ctx.ec) {
+        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.status = payload.at("status").get_string();
 
         if (response.status != "success") {
@@ -92,9 +100,9 @@ make_response(std::error_code ec, analytics_dataset_drop_request& request, analy
                 }
             }
             if (dataset_does_not_exist) {
-                response.ec = std::make_error_code(error::analytics_errc::dataset_not_found);
+                response.ctx.ec = std::make_error_code(error::analytics_errc::dataset_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);
             }
         }
     }

data/ext/couchbase/operations/analytics_dataset_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.
@@ -36,8 +36,7 @@ struct analytics_dataset_get_all_response {
         std::string message;
     };
 
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::vector<dataset> datasets{};
     std::vector<problem> errors{};
@@ -47,13 +46,14 @@ struct analytics_dataset_get_all_request {
     using response_type = analytics_dataset_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::analytics;
 
     std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
-    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context&)
+    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& /* context */)
     {
         tao::json::value body{
             { "statement", "SELECT d.* FROM Metadata.`Dataset` d WHERE d.DataverseName <> \"Metadata\"" },
@@ -67,14 +67,20 @@ struct analytics_dataset_get_all_request {
 };
 
 analytics_dataset_get_all_response
-make_response(std::error_code ec,
-              analytics_dataset_get_all_request& request,
+make_response(error_context::http&& ctx,
+              analytics_dataset_get_all_request& /* request */,
               analytics_dataset_get_all_request::encoded_response_type&& encoded)
 {
-    analytics_dataset_get_all_response response{ request.client_context_id, ec };
+    analytics_dataset_get_all_response response{ ctx };
 
-    if (!ec) {
-        auto payload = tao::json::from_string(encoded.body);
+    if (!response.ctx.ec) {
+        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.status = payload.at("status").get_string();
         if (response.status == "success") {
             auto* results = payload.find("results");
@@ -99,7 +105,7 @@ make_response(std::error_code ec,
                     response.errors.emplace_back(err);
                 }
             }
-            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/analytics_dataverse_create.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.
@@ -19,6 +19,7 @@
 
 #include <tao/json.hpp>
 
+#include <error_context/http.hxx>
 #include <version.hxx>
 
 namespace couchbase::operations
@@ -29,8 +30,7 @@ struct analytics_dataverse_create_response {
         std::string message;
     };
 
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::vector<problem> errors{};
 };
@@ -39,6 +39,7 @@ struct analytics_dataverse_create_request {
     using response_type = analytics_dataverse_create_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::analytics;
 
@@ -49,7 +50,7 @@ struct analytics_dataverse_create_request {
 
     bool ignore_if_exists{ false };
 
-    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context&)
+    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& /* context */)
     {
         std::string if_not_exists_clause = ignore_if_exists ? "IF NOT EXISTS" : "";
 
@@ -65,13 +66,19 @@ struct analytics_dataverse_create_request {
 };
 
 analytics_dataverse_create_response
-make_response(std::error_code ec,
-              analytics_dataverse_create_request& request,
+make_response(error_context::http&& ctx,
+              analytics_dataverse_create_request& /* request */,
               analytics_dataverse_create_request::encoded_response_type&& encoded)
 {
-    analytics_dataverse_create_response response{ request.client_context_id, ec };
-    if (!ec) {
-        auto payload = tao::json::from_string(encoded.body);
+    analytics_dataverse_create_response response{ ctx };
+    if (!response.ctx.ec) {
+        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.status = payload.at("status").get_string();
 
         if (response.status != "success") {
@@ -93,9 +100,9 @@ make_response(std::error_code ec,
                 }
             }
             if (dataverse_exists) {
-                response.ec = std::make_error_code(error::analytics_errc::dataverse_exists);
+                response.ctx.ec = std::make_error_code(error::analytics_errc::dataverse_exists);
             } 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);
             }
         }
     }

data/ext/couchbase/operations/analytics_dataverse_drop.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.
@@ -29,8 +29,7 @@ struct analytics_dataverse_drop_response {
         std::string message;
     };
 
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::vector<problem> errors{};
 };
@@ -39,6 +38,7 @@ struct analytics_dataverse_drop_request {
     using response_type = analytics_dataverse_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::analytics;
 
@@ -49,7 +49,7 @@ struct analytics_dataverse_drop_request {
 
     bool ignore_if_does_not_exist{ false };
 
-    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context&)
+    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& /* context */)
     {
         std::string if_exists_clause = ignore_if_does_not_exist ? "IF EXISTS" : "";
 
@@ -65,13 +65,19 @@ struct analytics_dataverse_drop_request {
 };
 
 analytics_dataverse_drop_response
-make_response(std::error_code ec,
-              analytics_dataverse_drop_request& request,
+make_response(error_context::http&& ctx,
+              analytics_dataverse_drop_request& /* request */,
               analytics_dataverse_drop_request::encoded_response_type&& encoded)
 {
-    analytics_dataverse_drop_response response{ request.client_context_id, ec };
-    if (!ec) {
-        auto payload = tao::json::from_string(encoded.body);
+    analytics_dataverse_drop_response response{ ctx };
+    if (!response.ctx.ec) {
+        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.status = payload.at("status").get_string();
 
         if (response.status != "success") {
@@ -93,9 +99,9 @@ make_response(std::error_code ec,
                 }
             }
             if (dataverse_does_not_exist) {
-                response.ec = std::make_error_code(error::analytics_errc::dataverse_not_found);
+                response.ctx.ec = std::make_error_code(error::analytics_errc::dataverse_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);
             }
         }
     }

data/ext/couchbase/operations/analytics_get_pending_mutations.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.
@@ -19,6 +19,7 @@
 
 #include <tao/json.hpp>
 
+#include <error_context/http.hxx>
 #include <version.hxx>
 
 namespace couchbase::operations
@@ -29,8 +30,7 @@ struct analytics_get_pending_mutations_response {
         std::string message;
     };
 
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::vector<problem> errors{};
     std::map<std::string, std::uint64_t> stats{};
@@ -40,13 +40,14 @@ struct analytics_get_pending_mutations_request {
     using response_type = analytics_get_pending_mutations_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::analytics;
 
     std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
-    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context&)
+    [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& /* context */)
     {
         encoded.method = "GET";
         encoded.path = "/analytics/node/agg/stats/remaining";
@@ -55,13 +56,19 @@ struct analytics_get_pending_mutations_request {
 };
 
 analytics_get_pending_mutations_response
-make_response(std::error_code ec,
-              analytics_get_pending_mutations_request& request,
+make_response(error_context::http&& ctx,
+              analytics_get_pending_mutations_request& /* request */,
               analytics_get_pending_mutations_request::encoded_response_type&& encoded)
 {
-    analytics_get_pending_mutations_response response{ request.client_context_id, ec };
-    if (!ec) {
-        auto payload = tao::json::from_string(encoded.body);
+    analytics_get_pending_mutations_response response{ ctx };
+    if (!response.ctx.ec) {
+        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;
+        }
         if (encoded.status_code == 200) {
             if (payload.is_object()) {
                 for (const auto& entry : payload.get_object()) {
@@ -84,7 +91,7 @@ make_response(std::error_code ec,
                 response.errors.emplace_back(err);
             }
         }
-        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;
 }