configurable username and password for tests

Auth tests now work despite SERVER 18415.

Author: ajdavis

CONTRIBUTING.md

@@ -120,6 +120,10 @@ have a locally running `mongod` instance available on `127.0.0.1:27017`. All
 tests should pass. Alternatively, you can specify `MONGOC_TEST_HOST`
 environment variable to specify a non-localhost hostname or ip address.
 
+To test with auth, create a "root" user on the "admin" database and set the
+`MONGOC_TEST_USER` and `MONGOC_TEST_PASSWORD` environment variables to its
+username and password.
+
 Set the `MONGOC_TEST_SSL` environment variable `on` to connect to the server via
 SSL with default options. Configure SSL options with paths
 `MONGOC_TEST_SSL_PEM_FILE`, `MONGOC_TEST_SSL_PEM_PWD`,

tests/test-libmongoc.c

@@ -212,6 +212,48 @@ test_framework_get_host (void)
    return host ? host : bson_strdup ("localhost");
 }
 
+/*
+ *--------------------------------------------------------------------------
+ *
+ * test_framework_get_admin_user --
+ *
+ *       Get the username of an admin user on the test MongoDB server.
+ *
+ * Returns:
+ *       A string you must bson_free, or NULL.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+char *
+test_framework_get_admin_user (void)
+{
+   return test_framework_getenv ("MONGOC_TEST_USER");
+}
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * test_framework_get_admin_password --
+ *
+ *       Get the password of an admin user on the test MongoDB server.
+ *
+ * Returns:
+ *       A string you must bson_free, or NULL.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+char *
+test_framework_get_admin_password (void)
+{
+   return test_framework_getenv ("MONGOC_TEST_PASSWORD");
+}
+
 /*
  *--------------------------------------------------------------------------
  *
@@ -271,7 +313,7 @@ uri_has_options (const mongoc_uri_t *uri)
  *
  *       Get the connection string of the test MongoDB server. Pass NULL
  *       to get the default connection string, or pass a string in to have
- *       "ssl=true" added if appropriate.
+ *       username, password, and "ssl=true" added if appropriate.
  *
  * Returns:
  *       A string you must bson_free.
@@ -285,15 +327,24 @@ char *
 test_framework_get_uri_str (const char *uri_str)
 {
    char *host = test_framework_get_host ();
+   char *user = test_framework_get_admin_user ();
+   char *password = test_framework_get_admin_password ();
    char *test_uri_str_base = uri_str ?
                              bson_strdup (uri_str) :
                              bson_strdup_printf ("mongodb://%s/", host);
 
    mongoc_uri_t *uri_parsed = mongoc_uri_new (test_uri_str_base);
    char *test_uri_str;
+   char *test_uri_str_auth;
 
    assert (uri_parsed);
 
+   if ((user && !password) || (!user && password)) {
+      fprintf (stderr, "Specify neither MONGOC_TEST_USER nor"
+                       " MONGOC_TEST_PASSWORD, or both\n");
+      abort ();
+   }
+
    /* add "ssl=true" if needed */
    if (test_framework_get_ssl () && !mongoc_uri_get_ssl (uri_parsed)) {
       test_uri_str = bson_strdup_printf (
@@ -304,10 +355,27 @@ test_framework_get_uri_str (const char *uri_str)
       test_uri_str = bson_strdup (test_uri_str_base);
    }
 
+   /* must we add "user:password"? */
+   mongoc_uri_destroy (uri_parsed);
+   uri_parsed = mongoc_uri_new (test_uri_str);
+   assert (uri_parsed);
+
+   if (user && password && !mongoc_uri_get_username (uri_parsed)) {
+      /* TODO: uri-escape username and password */
+      test_uri_str_auth = bson_strdup_printf (
+         "mongodb://%s:%s@%s",
+         user, password, test_uri_str + strlen ("mongodb://"));
+   } else {
+      test_uri_str_auth = bson_strdup (test_uri_str);
+   }
+
    mongoc_uri_destroy (uri_parsed);
    bson_free (host);
    bson_free (test_uri_str_base);
-   return test_uri_str;
+   bson_free (test_uri_str);
+   bson_free (user);
+   bson_free (password);
+   return test_uri_str_auth;
 }
 
 /*

tests/test-mongoc-client.c

@@ -57,11 +57,7 @@ gen_good_uri (const char *username,
 static void
 test_mongoc_client_authenticate (void)
 {
-   char *admin_username;
    mongoc_client_t *admin_client;
-   mongoc_database_t *admin_database;
-   bson_t admin_roles;
-   char *admin_uri;
    char *username;
    char *uri;
    bson_t roles;
@@ -74,28 +70,10 @@ test_mongoc_client_authenticate (void)
    bool r;
    bson_t q;
 
-   /*
-    * Add an admin user first.
-    */
-   admin_username = gen_test_user ();
-   admin_client = test_framework_client_new (NULL);
-   admin_database = mongoc_client_get_database (admin_client, "admin");
-   mongoc_database_remove_user (admin_database, admin_username, NULL);
-   bson_init (&admin_roles);
-   BCON_APPEND (&admin_roles,
-                "0", "{", "role", "root", "db", "admin", "}");
-
-   r = mongoc_database_add_user (admin_database, admin_username, "testpass",
-                                 &admin_roles, NULL, NULL);
-   assert (r);
-
    /*
     * Log in as admin.
     */
-   mongoc_database_destroy (admin_database);
-   mongoc_client_destroy (admin_client);
-   admin_uri = gen_good_uri (admin_username, "admin");
-   admin_client = test_framework_client_new (admin_uri);
+   admin_client = test_framework_client_new (NULL);
 
    /*
     * Add a user to the test database.
@@ -136,25 +114,14 @@ test_mongoc_client_authenticate (void)
    r = mongoc_database_remove_all_users (database, &error);
    assert (r);
 
-   /*
-    * Remove admin user.
-    */
-   admin_database = mongoc_client_get_database (admin_client, "admin");
-   r = mongoc_database_remove_user (admin_database, admin_username, NULL);
-   assert (r);
-
    mongoc_cursor_destroy (cursor);
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (auth_client);
    bson_destroy (&roles);
    bson_free (uri);
    bson_free (username);
-   bson_free (admin_uri);
    mongoc_database_destroy (database);
-   bson_destroy (&admin_roles);
-   mongoc_database_destroy (admin_database);
    mongoc_client_destroy (admin_client);
-   bson_free (admin_username);
 }