libcouchbase 0.3.3 → 1.0.0

data/ext/libcouchbase/tools/cbc.cc

@@ -3,6 +3,7 @@
 #include <map>
 #include <sstream>
 #include <iostream>
+#include <iomanip>
 #include <fstream>
 #include <algorithm>
 #include <libcouchbase/vbucket.h>
@@ -14,6 +15,8 @@
 #include "common/histogram.h"
 #include "cbc-handlers.h"
 #include "connspec.h"
+#include "contrib/lcb-jsoncpp/lcb-jsoncpp.h"
+
 using namespace cbc;
 
 using std::string;
@@ -910,7 +913,7 @@ ArithmeticHandler::run()
             cmd.initial = o_initial.result();
         }
         uint64_t delta = o_delta.result();
-        if (delta > std::numeric_limits<int64_t>::max()) {
+        if (delta > static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
             throw BadArg("Delta too big");
         }
         cmd.delta = static_cast<int64_t>(delta);
@@ -1166,7 +1169,7 @@ AdminHandler::run()
 {
     fprintf(stderr, "Requesting %s\n", getURI().c_str());
     HttpBaseHandler::run();
-    printf("%s", resbuf.c_str());
+    printf("%s\n", resbuf.c_str());
 }
 
 void
@@ -1202,6 +1205,125 @@ BucketCreateHandler::run()
     AdminHandler::run();
 }
 
+void
+RbacHandler::run()
+{
+    fprintf(stderr, "Requesting %s\n", getURI().c_str());
+    HttpBaseHandler::run();
+    if (o_raw.result()) {
+        printf("%s\n", resbuf.c_str());
+    } else {
+        format();
+    }
+}
+
+void
+RoleListHandler::format()
+{
+    Json::Value json;
+    if (!Json::Reader().parse(resbuf, json)) {
+        fprintf(stderr, "Failed to parse response as JSON, falling back to raw mode\n");
+        printf("%s\n", resbuf.c_str());
+    }
+
+    std::map<string, string> roles;
+    size_t max_width = 0;
+    for (Json::Value::iterator i = json.begin(); i != json.end(); i++) {
+        Json::Value role = *i;
+        string role_id = role["role"].asString() + ": ";
+        roles[role_id] = role["desc"].asString();
+        if (max_width < role_id.size()) {
+            max_width = role_id.size();
+        }
+    }
+    for (map<string, string>::iterator i = roles.begin(); i != roles.end(); i++) {
+        std::cout << std::left << std::setw(max_width) << i->first << i->second << std::endl;
+    }
+}
+
+void
+UserListHandler::format()
+{
+    Json::Value json;
+    if (!Json::Reader().parse(resbuf, json)) {
+        fprintf(stderr, "Failed to parse response as JSON, falling back to raw mode\n");
+        printf("%s\n", resbuf.c_str());
+    }
+
+    map<string, map<string, string> > users;
+    size_t max_width = 0;
+    for (Json::Value::iterator i = json.begin(); i != json.end(); i++) {
+        Json::Value user = *i;
+        string domain = user["domain"].asString();
+        string user_id = user["id"].asString();
+        string user_name = user["name"].asString();
+        if (!user_name.empty()) {
+            user_id += " (" + user_name + "): ";
+        }
+        stringstream roles;
+        Json::Value roles_ary = user["roles"];
+        for (Json::Value::iterator j = roles_ary.begin(); j != roles_ary.end(); j++) {
+            Json::Value role = *j;
+            roles << "\n   - " << role["role"].asString();
+            if (!role["bucket_name"].empty()) {
+                roles << "[" << role["bucket_name"].asString() << "]";
+            }
+        }
+        if (max_width < user_id.size()) {
+            max_width = user_id.size();
+        }
+        users[domain][user_id] = roles.str();
+    }
+    if (!users["local"].empty()) {
+        std::cout << "Local users:" << std::endl;
+        int j = 1;
+        for (map<string, string>::iterator i = users["local"].begin(); i != users["local"].end(); i++, j++) {
+            std::cout << j << ". " << std::left << std::setw(max_width) << i->first << i->second << std::endl;
+        }
+    }
+    if (!users["external"].empty()) {
+        std::cout << "External users:" << std::endl;
+        int j = 1;
+        for (map<string, string>::iterator i = users["external"].begin(); i != users["external"].end(); i++, j++) {
+            std::cout << j << ". " << std::left << std::setw(max_width) << i->first << i->second << std::endl;
+        }
+    }
+}
+
+void
+UserUpsertHandler::run()
+{
+    stringstream ss;
+
+    name = getRequiredArg();
+    domain = o_domain.result();
+    if (domain != "local" && domain != "external") {
+        throw BadArg("Unrecognized domain type");
+    }
+    if (!o_roles.passed()) {
+        throw BadArg("At least one role has to be specified");
+    }
+    std::vector<std::string> roles = o_roles.result();
+    std::string roles_param;
+    for (size_t ii = 0; ii < roles.size(); ii++) {
+        if (roles_param.empty()) {
+            roles_param += roles[ii];
+        } else {
+            roles_param += std::string(",") + roles[ii];
+        }
+    }
+    ss << "roles=" << roles_param;
+    if (o_full_name.passed()) {
+        ss << "&name=" << o_full_name.result();
+    }
+    if (o_password.passed()) {
+        ss << "&password=" << o_password.result();
+    }
+    body = ss.str();
+
+    AdminHandler::run();
+}
+
 struct HostEnt {
     string protostr;
     string hostname;
@@ -1326,6 +1448,7 @@ static const char* optionsOrder[] = {
         "hash",
         "lock",
         "unlock",
+        "cp",
         "rm",
         "stats",
         // "verify,
@@ -1337,6 +1460,10 @@ static const char* optionsOrder[] = {
         "bucket-create",
         "bucket-delete",
         "bucket-flush",
+        "role-list",
+        "user-list",
+        "user-upsert",
+        "user-delete",
         "connstr",
         "write-config",
         "strerror",
@@ -1423,8 +1550,10 @@ setupHandlers()
     handlers_s["strerror"] = new StrErrorHandler();
     handlers_s["observe-seqno"] = new ObserveSeqnoHandler();
     handlers_s["touch"] = new TouchHandler();
-
-
+    handlers_s["role-list"] = new RoleListHandler();
+    handlers_s["user-list"] = new UserListHandler();
+    handlers_s["user-upsert"] = new UserUpsertHandler();
+    handlers_s["user-delete"] = new UserDeleteHandler();
 
     map<string,Handler*>::iterator ii;
     for (ii = handlers_s.begin(); ii != handlers_s.end(); ++ii) {
@@ -1495,6 +1624,14 @@ wrapExternalBinary(int argc, char **argv, const std::string& name)
 #endif
 }
 
+static void cleanupHandlers()
+{
+    map<string,Handler*>::iterator iter = handlers_s.begin();
+    for (; iter != handlers_s.end(); iter++) {
+        delete iter->second;
+    }
+}
+
 int main(int argc, char **argv)
 {
 
@@ -1508,6 +1645,8 @@ int main(int argc, char **argv)
     }
 
     setupHandlers();
+    std::atexit(cleanupHandlers);
+
     string cmdname;
     parseCommandname(cmdname, argc, argv);
 
@@ -1541,10 +1680,4 @@ int main(int argc, char **argv)
         fprintf(stderr, "%s\n", err.what());
         exit(EXIT_FAILURE);
     }
-
-    map<string,Handler*>::iterator iter = handlers_s.begin();
-    for (; iter != handlers_s.end(); iter++) {
-        delete iter->second;
-    }
-    exit(EXIT_SUCCESS);
 }

data/ext/libcouchbase/tools/docgen/loc.h

@@ -202,7 +202,7 @@ public:
             const Loc& loc = vecs[ii];
             std::string s = loc.to_string();
             printf("Loc[%lu]. Buf=%p. Len=%lu. Content=%s\n",
-                ii, loc.at, loc.length, s.c_str());
+                ii, (void *)loc.at, loc.length, s.c_str());
         }
     }
 };

data/lib/libcouchbase/connection.rb

@@ -94,9 +94,10 @@ module Libcouchbase
             # Configure the connection to the database
             @connection = Ext::CreateSt.new
             @connection[:version] = 3
-            @connection[:v][:v3][:connstr] = FFI::MemoryPointer.from_string(connstr)
-            @connection[:v][:v3][:passwd]  = FFI::MemoryPointer.from_string(password) if password
-            @connection[:v][:v3][:io]      = @io_ptr.get_pointer(0)
+            @connection[:v][:v3][:connstr]  = FFI::MemoryPointer.from_string(connstr)
+            @connection[:v][:v3][:username] = FFI::MemoryPointer.from_string(bucket.to_s)
+            @connection[:v][:v3][:passwd]   = FFI::MemoryPointer.from_string(password) if password
+            @connection[:v][:v3][:io]       = @io_ptr.get_pointer(0)
             @handle_ptr = FFI::MemoryPointer.new :pointer, 1
         end
 

data/lib/libcouchbase/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module Libcouchbase
-    VERSION = '0.3.3'
+    VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -290,8 +290,12 @@ files:
 - ext/libcouchbase/doc/man/cbc-observe.1
 - ext/libcouchbase/doc/man/cbc-pillowfight.1
 - ext/libcouchbase/doc/man/cbc-rm.1
+- ext/libcouchbase/doc/man/cbc-role-list.1
 - ext/libcouchbase/doc/man/cbc-stats.1
 - ext/libcouchbase/doc/man/cbc-unlock.1
+- ext/libcouchbase/doc/man/cbc-user-delete.1
+- ext/libcouchbase/doc/man/cbc-user-list.1
+- ext/libcouchbase/doc/man/cbc-user-upsert.1
 - ext/libcouchbase/doc/man/cbc-verbosity.1
 - ext/libcouchbase/doc/man/cbc-version.1
 - ext/libcouchbase/doc/man/cbc-view.1
@@ -312,6 +316,8 @@ files:
 - ext/libcouchbase/example/subdoc/subdoc-multi.cc
 - ext/libcouchbase/example/subdoc/subdoc-simple.cc
 - ext/libcouchbase/example/tick/tick.c
+- ext/libcouchbase/example/users/README
+- ext/libcouchbase/example/users/users.c
 - ext/libcouchbase/example/views/views-example.cc
 - ext/libcouchbase/include/libcouchbase/_cxxwrap.h
 - ext/libcouchbase/include/libcouchbase/api-legacy.h
@@ -342,7 +348,6 @@ files:
 - ext/libcouchbase/include/memcached/COPYING
 - ext/libcouchbase/include/memcached/README
 - ext/libcouchbase/include/memcached/protocol_binary.h
-- ext/libcouchbase/include/memcached/vbucket.h
 - ext/libcouchbase/packaging/README
 - ext/libcouchbase/packaging/abicheck/.gitignore
 - ext/libcouchbase/packaging/abicheck/Makefile
@@ -387,15 +392,15 @@ files:
 - ext/libcouchbase/src/aspend.h
 - ext/libcouchbase/src/auth-priv.h
 - ext/libcouchbase/src/auth.cc
-- ext/libcouchbase/src/bootstrap.c
+- ext/libcouchbase/src/bootstrap.cc
 - ext/libcouchbase/src/bootstrap.h
 - ext/libcouchbase/src/bucketconfig/bc_cccp.cc
-- ext/libcouchbase/src/bucketconfig/bc_file.c
-- ext/libcouchbase/src/bucketconfig/bc_http.c
+- ext/libcouchbase/src/bucketconfig/bc_file.cc
+- ext/libcouchbase/src/bucketconfig/bc_http.cc
 - ext/libcouchbase/src/bucketconfig/bc_http.h
-- ext/libcouchbase/src/bucketconfig/bc_mcraw.c
+- ext/libcouchbase/src/bucketconfig/bc_static.cc
 - ext/libcouchbase/src/bucketconfig/clconfig.h
-- ext/libcouchbase/src/bucketconfig/confmon.c
+- ext/libcouchbase/src/bucketconfig/confmon.cc
 - ext/libcouchbase/src/callbacks.c
 - ext/libcouchbase/src/cbft.cc
 - ext/libcouchbase/src/cntl.cc
@@ -403,7 +408,10 @@ files:
 - ext/libcouchbase/src/connspec.cc
 - ext/libcouchbase/src/connspec.h
 - ext/libcouchbase/src/ctx-log-inl.h
+- ext/libcouchbase/src/dns-srv.cc
 - ext/libcouchbase/src/dump.cc
+- ext/libcouchbase/src/errmap.cc
+- ext/libcouchbase/src/errmap.h
 - ext/libcouchbase/src/getconfig.cc
 - ext/libcouchbase/src/gethrtime.c
 - ext/libcouchbase/src/handler.cc
@@ -420,22 +428,23 @@ files:
 - ext/libcouchbase/src/iofactory.c
 - ext/libcouchbase/src/jsparse/parser.cc
 - ext/libcouchbase/src/jsparse/parser.h
-- ext/libcouchbase/src/lcbht/lcbht.c
+- ext/libcouchbase/src/lcbht/lcbht.cc
 - ext/libcouchbase/src/lcbht/lcbht.h
-- ext/libcouchbase/src/lcbio/connect.c
+- ext/libcouchbase/src/lcbio/connect.cc
 - ext/libcouchbase/src/lcbio/connect.h
 - ext/libcouchbase/src/lcbio/ctx.c
 - ext/libcouchbase/src/lcbio/ctx.h
 - ext/libcouchbase/src/lcbio/iotable.c
 - ext/libcouchbase/src/lcbio/iotable.h
-- ext/libcouchbase/src/lcbio/ioutils.c
+- ext/libcouchbase/src/lcbio/ioutils.cc
 - ext/libcouchbase/src/lcbio/ioutils.h
 - ext/libcouchbase/src/lcbio/lcbio.h
-- ext/libcouchbase/src/lcbio/manager.c
+- ext/libcouchbase/src/lcbio/manager.cc
 - ext/libcouchbase/src/lcbio/manager.h
 - ext/libcouchbase/src/lcbio/protoctx.c
 - ext/libcouchbase/src/lcbio/rw-inl.h
 - ext/libcouchbase/src/lcbio/ssl.h
+- ext/libcouchbase/src/lcbio/timer-cxx.h
 - ext/libcouchbase/src/lcbio/timer-ng.h
 - ext/libcouchbase/src/lcbio/timer.c
 - ext/libcouchbase/src/legacy.c
@@ -456,6 +465,7 @@ files:
 - ext/libcouchbase/src/mcserver/mcserver.h
 - ext/libcouchbase/src/mcserver/negotiate.cc
 - ext/libcouchbase/src/mcserver/negotiate.h
+- ext/libcouchbase/src/mctx-helper.h
 - ext/libcouchbase/src/n1ql/ixmgmt.cc
 - ext/libcouchbase/src/n1ql/n1ql-internal.h
 - ext/libcouchbase/src/n1ql/n1ql.cc
@@ -466,22 +476,21 @@ files:
 - ext/libcouchbase/src/netbuf/netbuf.h
 - ext/libcouchbase/src/newconfig.cc
 - ext/libcouchbase/src/nodeinfo.cc
-- ext/libcouchbase/src/operations/cbflush.c
-- ext/libcouchbase/src/operations/counter.c
+- ext/libcouchbase/src/operations/cbflush.cc
+- ext/libcouchbase/src/operations/counter.cc
 - ext/libcouchbase/src/operations/durability-cas.cc
 - ext/libcouchbase/src/operations/durability-seqno.cc
 - ext/libcouchbase/src/operations/durability.cc
 - ext/libcouchbase/src/operations/durability_internal.h
-- ext/libcouchbase/src/operations/get.c
+- ext/libcouchbase/src/operations/get.cc
 - ext/libcouchbase/src/operations/observe-seqno.cc
-- ext/libcouchbase/src/operations/observe.c
-- ext/libcouchbase/src/operations/pktfwd.c
-- ext/libcouchbase/src/operations/remove.c
+- ext/libcouchbase/src/operations/observe.cc
+- ext/libcouchbase/src/operations/pktfwd.cc
+- ext/libcouchbase/src/operations/remove.cc
 - ext/libcouchbase/src/operations/stats.cc
-- ext/libcouchbase/src/operations/store.c
+- ext/libcouchbase/src/operations/store.cc
 - ext/libcouchbase/src/operations/subdoc.cc
-- ext/libcouchbase/src/operations/touch.c
-- ext/libcouchbase/src/packetutils.c
+- ext/libcouchbase/src/operations/touch.cc
 - ext/libcouchbase/src/packetutils.h
 - ext/libcouchbase/src/probes.d
 - ext/libcouchbase/src/rdb/bigalloc.c
@@ -490,15 +499,13 @@ files:
 - ext/libcouchbase/src/rdb/libcalloc.c
 - ext/libcouchbase/src/rdb/rope.c
 - ext/libcouchbase/src/rdb/rope.h
-- ext/libcouchbase/src/retrychk.c
+- ext/libcouchbase/src/retrychk.cc
 - ext/libcouchbase/src/retryq.cc
 - ext/libcouchbase/src/retryq.h
 - ext/libcouchbase/src/ringbuffer.c
 - ext/libcouchbase/src/ringbuffer.h
 - ext/libcouchbase/src/settings.c
 - ext/libcouchbase/src/settings.h
-- ext/libcouchbase/src/simplestring.c
-- ext/libcouchbase/src/simplestring.h
 - ext/libcouchbase/src/sllist-inl.h
 - ext/libcouchbase/src/sllist.h
 - ext/libcouchbase/src/ssl/CMakeLists.txt
@@ -506,7 +513,6 @@ files:
 - ext/libcouchbase/src/ssl/ssl_common.c
 - ext/libcouchbase/src/ssl/ssl_e.c
 - ext/libcouchbase/src/ssl/ssl_iot_common.h
-- ext/libcouchbase/src/ssobuf.h
 - ext/libcouchbase/src/strcodecs/base64.c
 - ext/libcouchbase/src/strcodecs/strcodecs.h
 - ext/libcouchbase/src/timings.c
@@ -522,9 +528,9 @@ files:
 - ext/libcouchbase/src/vbucket/rfc1321/md5.h
 - ext/libcouchbase/src/vbucket/rfc1321/md5c-inl.h
 - ext/libcouchbase/src/vbucket/vbucket.c
-- ext/libcouchbase/src/views/docreq.c
+- ext/libcouchbase/src/views/docreq.cc
 - ext/libcouchbase/src/views/docreq.h
-- ext/libcouchbase/src/views/viewreq.c
+- ext/libcouchbase/src/views/viewreq.cc
 - ext/libcouchbase/src/views/viewreq.h
 - ext/libcouchbase/src/wait.cc
 - ext/libcouchbase/tests/CMakeLists.txt
@@ -545,7 +551,6 @@ files:
 - ext/libcouchbase/tests/basic/t_ringbuffer.cc
 - ext/libcouchbase/tests/basic/t_slist.cc
 - ext/libcouchbase/tests/basic/t_strerror.cc
-- ext/libcouchbase/tests/basic/t_string.cc
 - ext/libcouchbase/tests/basic/t_urlencode.cc
 - ext/libcouchbase/tests/check-all.cc
 - ext/libcouchbase/tests/htparse/t_basic.cc
@@ -569,6 +574,8 @@ files:
 - ext/libcouchbase/tests/iotests/t_configcache.cc
 - ext/libcouchbase/tests/iotests/t_confmon.cc
 - ext/libcouchbase/tests/iotests/t_durability.cc
+- ext/libcouchbase/tests/iotests/t_eerrs.cc
+- ext/libcouchbase/tests/iotests/t_errmap.cc
 - ext/libcouchbase/tests/iotests/t_forward.cc
 - ext/libcouchbase/tests/iotests/t_get.cc
 - ext/libcouchbase/tests/iotests/t_http.cc
@@ -621,9 +628,11 @@ files:
 - ext/libcouchbase/tests/unit_tests.cc
 - ext/libcouchbase/tests/vbucket/confdata/bad.json
 - ext/libcouchbase/tests/vbucket/confdata/full_25.json
+- ext/libcouchbase/tests/vbucket/confdata/ketama_expected.json
 - ext/libcouchbase/tests/vbucket/confdata/memd_25.json
 - ext/libcouchbase/tests/vbucket/confdata/memd_30.json
 - ext/libcouchbase/tests/vbucket/confdata/memd_45.json
+- ext/libcouchbase/tests/vbucket/confdata/memd_ketama_config.json
 - ext/libcouchbase/tests/vbucket/confdata/terse_25.json
 - ext/libcouchbase/tests/vbucket/confdata/terse_30.json
 - ext/libcouchbase/tests/vbucket/t_config.cc