Merge branch 'master' of github.com:mongodb/mongo-c-driver

ajdavis · ajdavis · commit e93dc32c7aca · 2017-01-28T08:01:14.000-05:00
* 'master' of github.com:mongodb/mongo-c-driver: CDRIVER-1985 Deprecate mongoc_collection_save CDRIVER-2003 readConcern option should not be included in getMore commands CDRIVER-1998: Bump the handshake configure flags CDRIVER-2000 Implement sasl logger and fail early on unsupported mechanism
diff --git a/doc/mongoc_collection_save.rst b/doc/mongoc_collection_save.rst
@@ -3,6 +3,15 @@
 mongoc_collection_save()
 ========================
 
+Deprecated
+----------
+
+This function is deprecated and should not be used in new code.
+
+Please use :symbol:`mongoc_collection_insert() <mongoc_collection_insert>` or
+:symbol:`mongoc_collection_update() <mongoc_collection_update>` instead.
+
+
 Synopsis
 --------
 
@@ -12,7 +21,8 @@ Synopsis
   mongoc_collection_save (mongoc_collection_t *collection,
                           const bson_t *document,
                           const mongoc_write_concern_t *write_concern,
-                          bson_error_t *error);
+                          bson_error_t *error)
+      BSON_GNUC_DEPRECATED_FOR (mongoc_collection_insert or mongoc_collection_update);
 
 Parameters
 ----------
diff --git a/examples/parse_handshake_cfg.py b/examples/parse_handshake_cfg.py
@@ -19,6 +19,9 @@
     "MONGOC_MD_FLAG_HAVE_WEAK_SYMBOLS",
     "MONGOC_MD_FLAG_NO_AUTOMATIC_GLOBALS",
     "MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL",
+    "MONGOC_MD_FLAG_ENABLE_SASL_CYRUS",
+    "MONGOC_MD_FLAG_ENABLE_SASL_SSPI",
+    "MONGOC_MD_FLAG_HAVE_SOCKLEN",
 ]
 
 def main():
diff --git a/src/mongoc/mongoc-cluster-sasl.c b/src/mongoc/mongoc-cluster-sasl.c
@@ -174,7 +174,9 @@ _mongoc_cluster_auth_node_sasl (mongoc_cluster_t *cluster,
    _mongoc_sasl_init (&sasl);
 
    if ((mechanism = mongoc_uri_get_auth_mechanism (cluster->uri))) {
-      _mongoc_sasl_set_mechanism (&sasl, mechanism);
+      if (!_mongoc_sasl_set_mechanism (&sasl, mechanism, error)) {
+         goto failure;
+      }
    }
 
    _mongoc_sasl_set_pass (&sasl, mongoc_uri_get_password (cluster->uri));
diff --git a/src/mongoc/mongoc-collection.c b/src/mongoc/mongoc-collection.c
@@ -457,6 +457,14 @@ mongoc_collection_aggregate (mongoc_collection_t *collection,       /* IN */
       mongoc_read_concern_destroy (cursor->read_concern);
       cursor->read_concern = mongoc_read_concern_copy (
          mongoc_collection_get_read_concern (collection));
+
+      if (cursor->read_concern->level != NULL) {
+         const bson_t *read_concern_bson;
+
+         read_concern_bson =
+            _mongoc_read_concern_get_bson (cursor->read_concern);
+         BSON_APPEND_DOCUMENT (&command, "readConcern", read_concern_bson);
+      }
    }
 
 
diff --git a/src/mongoc/mongoc-collection.h b/src/mongoc/mongoc-collection.h
@@ -188,7 +188,8 @@ BSON_EXPORT (bool)
 mongoc_collection_save (mongoc_collection_t *collection,
                         const bson_t *document,
                         const mongoc_write_concern_t *write_concern,
-                        bson_error_t *error);
+                        bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_insert or mongoc_collection_update);
 BSON_EXPORT (bool)
 mongoc_collection_remove (mongoc_collection_t *collection,
                           mongoc_remove_flags_t flags,
diff --git a/src/mongoc/mongoc-cursor.c b/src/mongoc/mongoc-cursor.c
@@ -1265,12 +1265,6 @@ _mongoc_cursor_run_command (mongoc_cursor_t *cursor,
                                    read_prefs_result.query_with_read_prefs);
    }
 
-   if (cursor->read_concern &&
-       server_stream->sd->max_wire_version >= WIRE_VERSION_READ_CONCERN) {
-      mongoc_read_concern_append (cursor->read_concern,
-                                  read_prefs_result.query_with_read_prefs);
-   }
-
    ret = mongoc_cluster_run_command_monitored (
       cluster,
       server_stream,
diff --git a/src/mongoc/mongoc-database.c b/src/mongoc/mongoc-database.c
@@ -414,7 +414,7 @@ mongoc_database_add_user_legacy (mongoc_database_t *database,
       bson_append_utf8 (&user, "pwd", 3, pwd, -1);
    }
 
-   if (!mongoc_collection_save (collection, &user, NULL, error)) {
+   if (!mongoc_collection_insert (collection, MONGOC_INSERT_NONE, &user, NULL, error)) {
       GOTO (failure_with_user);
    }
 
diff --git a/src/mongoc/mongoc-handshake-private.h b/src/mongoc/mongoc-handshake-private.h
@@ -55,7 +55,10 @@ typedef enum {
    MONGOC_MD_FLAG_HAVE_SASL_CLIENT_DONE = 1 << 11,
    MONGOC_MD_FLAG_HAVE_WEAK_SYMBOLS = 1 << 12,
    MONGOC_MD_FLAG_NO_AUTOMATIC_GLOBALS = 1 << 13,
-   MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL = 1 << 14
+   MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL = 1 << 14,
+   MONGOC_MD_FLAG_ENABLE_SASL_CYRUS = 1 << 15,
+   MONGOC_MD_FLAG_ENABLE_SASL_SSPI = 1 << 16,
+   MONGOC_MD_FLAG_HAVE_SOCKLEN = 1 << 17,
 } mongoc_handshake_config_flags_t;
 
 
diff --git a/src/mongoc/mongoc-handshake.c b/src/mongoc/mongoc-handshake.c
@@ -109,6 +109,18 @@ _get_config_bitfield (void)
    bf |= MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL;
 #endif
 
+#ifdef MONGOC_ENABLE_SASL_CYRUS
+   bf |= MONGOC_MD_FLAG_ENABLE_SASL_CYRUS;
+#endif
+
+#ifdef MONGOC_ENABLE_SASL_SSPI
+   bf |= MONGOC_MD_FLAG_ENABLE_SASL_SSPI;
+#endif
+
+#ifdef MONGOC_HAVE_SOCKLEN
+   bf |= MONGOC_MD_FLAG_HAVE_SOCKLEN;
+#endif
+
    return bf;
 }
 
diff --git a/src/mongoc/mongoc-init.c b/src/mongoc/mongoc-init.c
@@ -45,6 +45,7 @@
 
 #ifdef MONGOC_ENABLE_SASL_CYRUS
 #include <sasl/sasl.h>
+#include "mongoc-sasl-private.h"
 
 static void *
 mongoc_sasl_mutex_alloc (void)
@@ -88,6 +89,12 @@ mongoc_sasl_mutex_free (void *mutex)
 
 static MONGOC_ONCE_FUN (_mongoc_do_init)
 {
+#ifdef MONGOC_ENABLE_SASL_CYRUS
+   int status;
+   sasl_callback_t callbacks[] = {
+      {SASL_CB_LOG, SASL_CALLBACK_FN (_mongoc_sasl_log), NULL},
+      {SASL_CB_LIST_END}};
+#endif
 #ifdef MONGOC_ENABLE_SSL_OPENSSL
    _mongoc_openssl_init ();
 #elif defined(MONGOC_ENABLE_SSL_LIBRESSL)
@@ -106,8 +113,8 @@ static MONGOC_ONCE_FUN (_mongoc_do_init)
                    mongoc_sasl_mutex_unlock,
                    mongoc_sasl_mutex_free);
 
-   /* TODO: logging callback? */
-   sasl_client_init (NULL);
+   status = sasl_client_init (callbacks);
+   BSON_ASSERT (status == SASL_OK);
 #endif
 
    _mongoc_counters_init ();
diff --git a/src/mongoc/mongoc-sasl-private.h b/src/mongoc/mongoc-sasl-private.h
@@ -48,20 +48,28 @@ struct _mongoc_sasl_t {
 };
 
 
+#ifndef SASL_CALLBACK_FN
+#define SASL_CALLBACK_FN(_f) ((int (*) (void)) (_f))
+#endif
+
 void
 _mongoc_sasl_init (mongoc_sasl_t *sasl);
 void
 _mongoc_sasl_set_pass (mongoc_sasl_t *sasl, const char *pass);
 void
 _mongoc_sasl_set_user (mongoc_sasl_t *sasl, const char *user);
-void
-_mongoc_sasl_set_mechanism (mongoc_sasl_t *sasl, const char *mechanism);
+bool
+_mongoc_sasl_set_mechanism (mongoc_sasl_t *sasl,
+                            const char *mechanism,
+                            bson_error_t *error);
 void
 _mongoc_sasl_set_service_name (mongoc_sasl_t *sasl, const char *service_name);
 void
 _mongoc_sasl_set_service_host (mongoc_sasl_t *sasl, const char *service_host);
 void
 _mongoc_sasl_set_properties (mongoc_sasl_t *sasl, const mongoc_uri_t *uri);
+int
+_mongoc_sasl_log (mongoc_sasl_t *sasl, int level, const char *message);
 void
 _mongoc_sasl_destroy (mongoc_sasl_t *sasl);
 bool
diff --git a/src/mongoc/mongoc-sasl.c b/src/mongoc/mongoc-sasl.c
@@ -25,18 +25,54 @@
 #include "mongoc-util-private.h"
 #include "mongoc-trace-private.h"
 
+#undef MONGOC_LOG_DOMAIN
+#define MONGOC_LOG_DOMAIN "CYRUS-SASL"
 
-#ifndef SASL_CALLBACK_FN
-#define SASL_CALLBACK_FN(_f) ((int (*) (void)) (_f))
-#endif
+int
+_mongoc_sasl_log (mongoc_sasl_t *sasl, int level, const char *message)
+{
+   TRACE ("SASL Log; level=%d: message=%s", level, message);
+   return SASL_OK;
+}
 
-void
-_mongoc_sasl_set_mechanism (mongoc_sasl_t *sasl, const char *mechanism)
+bool
+_mongoc_sasl_set_mechanism (mongoc_sasl_t *sasl,
+                            const char *mechanism,
+                            bson_error_t *error)
 {
+   bson_string_t *str = bson_string_new ("");
+   const char **mechs = sasl_global_listmech ();
+   int i = 0;
+   bool ok = false;
+
    BSON_ASSERT (sasl);
 
-   bson_free (sasl->mechanism);
-   sasl->mechanism = mechanism ? bson_strdup (mechanism) : NULL;
+   for (i = 0; mechs[i]; i++) {
+      if (!strcmp (mechs[i], mechanism)) {
+         ok = true;
+         break;
+      }
+      bson_string_append (str, mechs[i]);
+      if (mechs[i + 1]) {
+         bson_string_append (str, ",");
+      }
+   }
+
+   if (ok) {
+      bson_free (sasl->mechanism);
+      sasl->mechanism = mechanism ? bson_strdup (mechanism) : NULL;
+   } else {
+      bson_set_error (error,
+                      MONGOC_ERROR_SASL,
+                      SASL_NOMECH,
+                      "SASL Failure: Unsupported mechanism by client: %s. "
+                      "Available mechanisms: %s",
+                      mechanism,
+                      str->str);
+   }
+
+   bson_string_free (str, 0);
+   return ok;
 }
 
 
@@ -73,7 +109,7 @@ _mongoc_sasl_set_pass (mongoc_sasl_t *sasl, const char *pass)
 
 static int
 _mongoc_sasl_canon_user (sasl_conn_t *conn,
-                         void *context,
+                         mongoc_sasl_t *sasl,
                          const char *in,
                          unsigned inlen,
                          unsigned flags,
@@ -246,6 +282,11 @@ _mongoc_sasl_is_failure (int status, bson_error_t *error)
 {
    bool ret = (status < 0);
 
+   TRACE ("Got status: %d ok is %d, continue=%d interact=%d\n",
+          status,
+          SASL_OK,
+          SASL_CONTINUE,
+          SASL_INTERACT);
    if (ret) {
       switch (status) {
       case SASL_NOMEM:
@@ -323,12 +364,16 @@ _mongoc_sasl_start (mongoc_sasl_t *sasl,
 
    status = sasl_client_new (
       service_name, service_host, NULL, NULL, sasl->callbacks, 0, &sasl->conn);
+   TRACE ("Created new sasl client %s",
+          status == SASL_OK ? "successfully" : "UNSUCCESSFULLY");
    if (_mongoc_sasl_is_failure (status, error)) {
       return false;
    }
 
    status = sasl_client_start (
       sasl->conn, sasl->mechanism, &sasl->interact, &raw, &raw_len, &mechanism);
+   TRACE ("Started the sasl client %s",
+          status == SASL_CONTINUE ? "successfully" : "UNSUCCESSFULLY");
    if (_mongoc_sasl_is_failure (status, error)) {
       return false;
    }
@@ -400,8 +445,11 @@ _mongoc_sasl_step (mongoc_sasl_t *sasl,
       return false;
    }
 
+   TRACE ("%s", "Running client_step");
    status = sasl_client_step (
       sasl->conn, (char *) outbuf, *outbuflen, &sasl->interact, &raw, &rawlen);
+   TRACE ("%s sent a client step",
+          status == SASL_OK ? "Successfully" : "UNSUCCESSFULLY");
    if (_mongoc_sasl_is_failure (status, error)) {
       return false;
    }
diff --git a/tests/test-mongoc-collection.c b/tests/test-mongoc-collection.c
@@ -1231,6 +1231,8 @@ test_save (void)
    context = bson_context_new (BSON_CONTEXT_NONE);
    ASSERT (context);
 
+   BEGIN_IGNORE_DEPRECATIONS;
+
    for (i = 0; i < 10; i++) {
       bson_init (&b);
       bson_oid_init (&oid, context);
@@ -1253,6 +1255,9 @@ test_save (void)
 
    r = mongoc_collection_save (
       collection, tmp_bson ("{'a.b': 1}"), NULL, &error);
+
+   END_IGNORE_DEPRECATIONS;
+
    ASSERT (!r);
    ASSERT_ERROR_CONTAINS (error,
                           MONGOC_ERROR_COMMAND,
@@ -4402,6 +4407,54 @@ test_find_read_concern (void)
    mock_server_destroy (server);
 }
 
+static void
+test_getmore_read_concern_live (void *ctx)
+{
+   mongoc_client_t *client;
+   mongoc_read_concern_t *rc;
+   mongoc_collection_t *collection;
+   mongoc_cursor_t *cursor;
+   mongoc_write_concern_t *wc;
+   const bson_t *doc;
+   bson_error_t error;
+   int i = 0;
+
+   client = test_framework_client_new ();
+   collection = get_test_collection (client, "test_read_concern");
+
+   rc = mongoc_read_concern_new ();
+   mongoc_read_concern_set_level (rc, MONGOC_READ_CONCERN_LEVEL_LOCAL);
+   mongoc_collection_set_read_concern (collection, rc);
+
+
+   wc = mongoc_write_concern_new ();
+   mongoc_write_concern_set_w (wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
+   mongoc_collection_set_write_concern (collection, wc);
+
+   for (i=5000; i > 0; i--) {
+      mongoc_collection_insert (collection, MONGOC_INSERT_NONE, tmp_bson
+            ("{'a': 1}"), NULL, NULL);
+   }
+   cursor = mongoc_collection_find_with_opts (collection,
+         tmp_bson ("{}"),
+         NULL,
+         NULL);
+
+   while (mongoc_cursor_next (cursor, &doc)) {
+      i++;
+   }
+   ASSERT_OR_PRINT (!mongoc_cursor_error (cursor, &error), error);
+
+   ASSERT_CMPINT (i, ==, 5000);
+   mongoc_cursor_destroy (cursor);
+
+   mongoc_read_concern_destroy (rc);
+   mongoc_write_concern_destroy (wc);
+   mongoc_collection_destroy (collection);
+   mongoc_client_destroy (client);
+}
+
+
 
 static void
 test_aggregate_read_concern (void)
@@ -4829,6 +4882,9 @@ test_collection_install (TestSuite *suite)
    TestSuite_Add (suite, "/Collection/stats/read_pref", test_stats_read_pref);
    TestSuite_Add (
       suite, "/Collection/find_read_concern", test_find_read_concern);
+   TestSuite_AddFull (
+      suite, "/Collection/getmore_read_concern_live",
+      test_getmore_read_concern_live, NULL, NULL, test_framework_skip_if_max_wire_version_less_than_4);
    TestSuite_AddLive (
       suite, "/Collection/find_and_modify", test_find_and_modify);
    TestSuite_Add (suite,

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`"MONGOC_MD_FLAG_HAVE_WEAK_SYMBOLS",`
`20`	`20`	`"MONGOC_MD_FLAG_NO_AUTOMATIC_GLOBALS",`
`21`	`21`	`"MONGOC_MD_FLAG_ENABLE_SSL_LIBRESSL",`
	`22`	`+ "MONGOC_MD_FLAG_ENABLE_SASL_CYRUS",`
	`23`	`+ "MONGOC_MD_FLAG_ENABLE_SASL_SSPI",`
	`24`	`+ "MONGOC_MD_FLAG_HAVE_SOCKLEN",`
`22`	`25`	`]`
`23`	`26`
`24`	`27`	`def main():`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,9 @@ _mongoc_cluster_auth_node_sasl (mongoc_cluster_t *cluster,`
`174`	`174`	`_mongoc_sasl_init (&sasl);`
`175`	`175`
`176`	`176`	`if ((mechanism = mongoc_uri_get_auth_mechanism (cluster->uri))) {`
`177`		`- _mongoc_sasl_set_mechanism (&sasl, mechanism);`
	`177`	`+ if (!_mongoc_sasl_set_mechanism (&sasl, mechanism, error)) {`
	`178`	`+ goto failure;`
	`179`	`+ }`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`_mongoc_sasl_set_pass (&sasl, mongoc_uri_get_password (cluster->uri));`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ mongoc_database_add_user_legacy (mongoc_database_t *database,`
`414`	`414`	`bson_append_utf8 (&user, "pwd", 3, pwd, -1);`
`415`	`415`	`}`
`416`	`416`
`417`		`- if (!mongoc_collection_save (collection, &user, NULL, error)) {`
	`417`	`+ if (!mongoc_collection_insert (collection, MONGOC_INSERT_NONE, &user, NULL, error)) {`
`418`	`418`	`GOTO (failure_with_user);`
`419`	`419`	`}`
`420`	`420`