test threaded GSSAPI auth

This test of Cyrus SASL's GSSAPI Kerberos auth wasn't running in
Evergreen. Split it to a separate test program and run it with the
other auth tests.

Also, only compile test-mongoc-cyrus.c if we are using Cyrus SASL.

Author: ajdavis

.evergreen/run-auth-tests.sh

@@ -31,21 +31,26 @@ case "$OS" in
       export PATH=$PATH:`pwd`/tests:`pwd`/Debug:`pwd`/src/libbson/Debug
       chmod +x ./Debug/* src/libbson/Debug/*
       PING="./Debug/mongoc-ping.exe"
+      TEST_GSSAPI="./Debug/test-mongoc-gssapi.exe"
       ;;
 
    darwin)
       sed -i'.bak' 's/\/data\/mci\/[a-z0-9]\{32\}\/mongoc/./g' mongoc-ping
+      sed -i'.bak' 's/\/data\/mci\/[a-z0-9]\{32\}\/mongoc/./g' test-mongoc-gssapi
       export DYLD_LIBRARY_PATH="install-dir/lib:.libs:src/libbson/.libs"
       PING="./mongoc-ping"
+      TEST_GSSAPI="./test-mongoc-gssapi"
       ;;
 
    *)
       # This libtool wrapper script was built in a unique dir like
       # "/data/mci/998e754a0d1ed79b8bf733f405b87778/mongoc",
       # replace its absolute path with "." so it can run in the CWD.
       sed -i'' 's/\/data\/mci\/[a-z0-9]\{32\}\/mongoc/./g' mongoc-ping
+      sed -i'' 's/\/data\/mci\/[a-z0-9]\{32\}\/mongoc/./g' test-mongoc-gssapi
       export LD_LIBRARY_PATH="install-dir/lib:.libs:src/libbson/.libs"
       PING="./mongoc-ping"
+      TEST_GSSAPI="./test-mongoc-gssapi"
 esac
 
 if test -f /tmp/drivers.keytab; then
@@ -87,6 +92,9 @@ $PING "mongodb://${AUTH_MONGODBCR}@${AUTH_HOST}/mongodb-cr?authMechanism=MONGODB
 if [ $SASL -eq 1 ]; then
 echo "Authenticating using GSSAPI"
    $PING "mongodb://${AUTH_GSSAPI}@${AUTH_HOST}/?authMechanism=GSSAPI&${C_TIMEOUT}"
+   echo "Test threaded GSSAPI auth"
+   MONGOC_TEST_GSSAPI_HOST="${AUTH_HOST}" MONGOC_TEST_GSSAPI_USER="${AUTH_GSSAPI}" $TEST_GSSAPI
+   echo "Threaded GSSAPI auth OK"
    if [ "${OS%_*}" = "cygwin" ]; then
       echo "Authenticating using GSSAPI (service realm: LDAPTEST.10GEN.CC)"
       $PING "mongodb://${AUTH_CROSSREALM}@${AUTH_HOST}/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_REALM:LDAPTEST.10GEN.CC&${C_TIMEOUT}"

.gitignore

@@ -95,6 +95,7 @@ test-mongoc-stream
 test-mongoc-stream-tls
 test-mongoc-uri
 test-mongoc-write-concern
+test-mongoc-gssapi
 # Windows things
 *.dir
 *.vcxproj*

CMakeLists.txt

@@ -768,13 +768,14 @@ if (MONGOC_ENABLE_SSL)
       ${SOURCE_DIR}/tests/test-mongoc-stream-tls-error.c)
 endif()
 
-if (MONGOC_ENABLE_SASL)
+if (MONGOC_ENABLE_SASL_CYRUS)
    set(test-libmongoc-sources ${test-libmongoc-sources}
       ${SOURCE_DIR}/tests/test-mongoc-cyrus.c
    )
 endif ()
 
 mongoc_add_test(test-libmongoc FALSE ${test-libmongoc-sources})
+mongoc_add_test (test-mongoc-gssapi TRUE ${SOURCE_DIR}/tests/test-mongoc-gssapi.c)
 
 if (ENABLE_TESTS)
    enable_testing()

tests/Makefile.am

@@ -129,7 +129,7 @@ test_libmongoc_SOURCES += \
 	tests/ssl-test.h
 endif
 
-if ENABLE_SASL
+if ENABLE_SASL_CYRUS
 test_libmongoc_SOURCES += \
 	tests/test-mongoc-cyrus.c
 endif
@@ -138,7 +138,12 @@ test_libmongoc_LDADD = libmongoc.la $(TEST_LIBS)
 test_libmongoc_LDFLAGS = -no-undefined \
                          -rpath $(libdir)
 
-
+noinst_PROGRAMS += test-mongoc-gssapi
+test_mongoc_gssapi_SOURCES = tests/test-mongoc-gssapi.c
+test_mongoc_gssapi_CFLAGS = $(TEST_CFLAGS)
+test_mongoc_gssapi_LDADD = libmongoc.la $(TEST_LIBS)
+test_mongoc_gssapi_LDFLAGS = -no-undefined \
+                             -rpath $(libdir)
 
 check: test
 

tests/test-libmongoc.c

@@ -147,9 +147,9 @@ test_x509_install (TestSuite *suite);
 extern void
 test_stream_tls_error_install (TestSuite *suite);
 #endif
-#ifdef MONGOC_ENABLE_SASL
+#ifdef MONGOC_ENABLE_SASL_CYRUS
 extern void
-test_sasl_install (TestSuite *suite);
+test_cyrus_install (TestSuite *suite);
 #endif
 
 
@@ -2169,8 +2169,8 @@ main (int argc, char *argv[])
    test_x509_install (&suite);
    test_stream_tls_error_install (&suite);
 #endif
-#ifdef MONGOC_ENABLE_SASL
-   test_sasl_install (&suite);
+#ifdef MONGOC_ENABLE_SASL_CYRUS
+   test_cyrus_install (&suite);
 #endif
 
    ret = TestSuite_Run (&suite);

tests/test-mongoc-cyrus.c

@@ -15,131 +15,13 @@
  */
 
 #include <mongoc.h>
-#include <mongoc-thread-private.h>
-#ifdef MONGOC_ENABLE_SASL_CYRUS
 #include <mongoc-cyrus-private.h>
 #include <mongoc-client-private.h>
 
-#endif
-
 #include "TestSuite.h"
 #include "test-libmongoc.h"
 
 
-static const char *GSSAPI_HOST = "MONGOC_TEST_GSSAPI_HOST";
-static const char *GSSAPI_USER = "MONGOC_TEST_GSSAPI_USER";
-
-#define NTHREADS 10
-#define NLOOPS 10
-
-
-int
-should_run_gssapi_kerberos (void)
-{
-   char *host = test_framework_getenv (GSSAPI_HOST);
-   char *user = test_framework_getenv (GSSAPI_USER);
-   int ret = (host && user);
-
-   bson_free (host);
-   bson_free (user);
-
-   return ret;
-}
-
-
-struct closure_t {
-   mongoc_client_pool_t *pool;
-   int finished;
-   mongoc_mutex_t mutex;
-};
-
-
-static void *
-gssapi_kerberos_worker (void *data)
-{
-   struct closure_t *closure = (struct closure_t *) data;
-   mongoc_client_pool_t *pool = closure->pool;
-   mongoc_client_t *client;
-   mongoc_collection_t *collection;
-   mongoc_cursor_t *cursor;
-   bson_error_t error;
-   const bson_t *doc;
-   bson_t query = BSON_INITIALIZER;
-   int i;
-
-   for (i = 0; i < NLOOPS; i++) {
-      client = mongoc_client_pool_pop (pool);
-      collection = mongoc_client_get_collection (client, "kerberos", "test");
-      cursor = mongoc_collection_find (
-         collection, MONGOC_QUERY_NONE, 0, 0, 0, &query, NULL, NULL);
-
-      if (!mongoc_cursor_next (cursor, &doc) &&
-          mongoc_cursor_error (cursor, &error)) {
-         fprintf (stderr, "Cursor Failure: %s\n", error.message);
-         abort ();
-      }
-
-      mongoc_cursor_destroy (cursor);
-      mongoc_collection_destroy (collection);
-      mongoc_client_pool_push (pool, client);
-   }
-
-   bson_destroy (&query);
-
-   mongoc_mutex_lock (&closure->mutex);
-   closure->finished++;
-   mongoc_mutex_unlock (&closure->mutex);
-
-   return NULL;
-}
-
-
-static void
-test_gssapi_kerberos (void *context)
-{
-   char *host = test_framework_getenv (GSSAPI_HOST);
-   char *user = test_framework_getenv (GSSAPI_USER);
-   char *uri_str;
-   mongoc_uri_t *uri;
-   struct closure_t closure = {0};
-   int i;
-   mongoc_thread_t threads[NTHREADS];
-
-   BSON_ASSERT (host && user);
-
-   mongoc_mutex_init (&closure.mutex);
-
-   uri_str = bson_strdup_printf (
-      "mongodb://%s@%s/?authMechanism=GSSAPI&serverselectiontimeoutms=1000",
-      user,
-      host);
-
-   uri = mongoc_uri_new (uri_str);
-   closure.pool = mongoc_client_pool_new (uri);
-
-   for (i = 0; i < NTHREADS; i++) {
-      mongoc_thread_create (
-         &threads[i], gssapi_kerberos_worker, (void *) &closure);
-   }
-
-   for (i = 0; i < NTHREADS; i++) {
-      mongoc_thread_join (threads[i]);
-   }
-
-   mongoc_mutex_lock (&closure.mutex);
-   ASSERT_CMPINT (NTHREADS, ==, closure.finished);
-   mongoc_mutex_unlock (&closure.mutex);
-
-   mongoc_client_pool_destroy (closure.pool);
-   mongoc_mutex_destroy (&closure.mutex);
-   mongoc_uri_destroy (uri);
-   bson_free (uri_str);
-   bson_free (host);
-   bson_free (user);
-}
-
-
-#ifdef MONGOC_ENABLE_SASL_CYRUS
 static void
 test_sasl_properties (void)
 {
@@ -203,26 +85,17 @@ test_sasl_canonicalize_hostname (void *ctx)
    mongoc_server_stream_cleanup (ss);
    mongoc_client_destroy (client);
 }
-#endif
 
 
 void
-test_sasl_install (TestSuite *suite)
+test_cyrus_install (TestSuite *suite)
 {
-   TestSuite_AddFull (suite,
-                      "/SASL/gssapi_kerberos",
-                      test_gssapi_kerberos,
-                      NULL,
-                      NULL,
-                      should_run_gssapi_kerberos);
-#ifdef MONGOC_ENABLE_SASL_CYRUS
+   TestSuite_Add (suite, "/SASL/properties", test_sasl_properties);
    TestSuite_AddFull (suite,
                       "/SASL/canonicalize",
                       test_sasl_canonicalize_hostname,
                       NULL,
                       NULL,
                       TestSuite_CheckLive,
                       test_framework_skip_if_offline);
-   TestSuite_Add (suite, "/SASL/properties", test_sasl_properties);
-#endif
 }