CDRIVER-3476 lower case options (#645)

* CDRIVER-3476 lower case options set with
mongoc_uri_set_options_as_* functions

Author: Andrew Witten

src/libmongoc/src/mongoc/mongoc-uri.c

@@ -123,6 +123,13 @@ count_dots (const char *s)
    return n;
 }
 
+static char *
+lowercase_str_new (const char *key)
+{
+   char *ret = bson_strdup (key);
+   mongoc_lowercase (key, ret);
+   return ret;
+}
 
 /* at least one character, and does not start with dot */
 static bool
@@ -2573,6 +2580,7 @@ _mongoc_uri_set_option_as_int32_with_error (mongoc_uri_t *uri,
    const char *option;
    const bson_t *options;
    bson_iter_t iter;
+   char *option_lowercase = NULL;
 
    option = mongoc_uri_canonicalize_option (option_orig);
    /* Server Discovery and Monitoring Spec: "the driver MUST NOT permit users
@@ -2611,14 +2619,16 @@ _mongoc_uri_set_option_as_int32_with_error (mongoc_uri_t *uri,
          return false;
       }
    }
-
-   if (!bson_append_int32 (&uri->options, option, -1, value)) {
+   option_lowercase = lowercase_str_new (option);
+   if (!bson_append_int32 (&uri->options, option_lowercase, -1, value)) {
+      bson_free (option_lowercase);
       MONGOC_URI_ERROR (
          error, "Failed to set URI option \"%s\" to %d", option_orig, value);
 
       return false;
    }
 
+   bson_free (option_lowercase);
    return true;
 }
 
@@ -2645,6 +2655,7 @@ _mongoc_uri_set_option_as_int32 (mongoc_uri_t *uri,
    const char *option;
    const bson_t *options;
    bson_iter_t iter;
+   char *option_lowercase = NULL;
 
    option = mongoc_uri_canonicalize_option (option_orig);
    if ((options = mongoc_uri_get_options (uri)) &&
@@ -2657,7 +2668,9 @@ _mongoc_uri_set_option_as_int32 (mongoc_uri_t *uri,
       }
    }
 
-   bson_append_int32 (&uri->options, option, -1, value);
+   option_lowercase = lowercase_str_new (option);
+   bson_append_int32 (&uri->options, option_lowercase, -1, value);
+   bson_free (option_lowercase);
    return true;
 }
 
@@ -2795,6 +2808,7 @@ _mongoc_uri_set_option_as_int64_with_error (mongoc_uri_t *uri,
    const char *option;
    const bson_t *options;
    bson_iter_t iter;
+   char *option_lowercase = NULL;
 
    option = mongoc_uri_canonicalize_option (option_orig);
 
@@ -2814,15 +2828,17 @@ _mongoc_uri_set_option_as_int64_with_error (mongoc_uri_t *uri,
       }
    }
 
-   if (!bson_append_int64 (&uri->options, option, -1, value)) {
+   option_lowercase = lowercase_str_new (option);
+   if (!bson_append_int64 (&uri->options, option_lowercase, -1, value)) {
+      bson_free (option_lowercase);
       MONGOC_URI_ERROR (error,
                         "Failed to set URI option \"%s\" to %" PRId64,
                         option_orig,
                         value);
 
       return false;
    }
-
+   bson_free (option_lowercase);
    return true;
 }
 
@@ -2893,6 +2909,7 @@ mongoc_uri_set_option_as_bool (mongoc_uri_t *uri,
                                bool value)
 {
    const char *option;
+   char *option_lowercase;
    const bson_t *options;
    bson_iter_t iter;
 
@@ -2912,8 +2929,9 @@ mongoc_uri_set_option_as_bool (mongoc_uri_t *uri,
          return false;
       }
    }
-
-   bson_append_bool (&uri->options, option, -1, value);
+   option_lowercase = lowercase_str_new (option);
+   bson_append_bool (&uri->options, option_lowercase, -1, value);
+   bson_free (option_lowercase);
    return true;
 }
 
@@ -2989,6 +3007,7 @@ mongoc_uri_set_option_as_utf8 (mongoc_uri_t *uri,
 {
    const char *option;
    size_t len;
+   char *option_lowercase = NULL;
 
    option = mongoc_uri_canonicalize_option (option_orig);
    BSON_ASSERT (option);
@@ -3005,7 +3024,10 @@ mongoc_uri_set_option_as_utf8 (mongoc_uri_t *uri,
    if (!bson_strcasecmp (option, MONGOC_URI_APPNAME)) {
       return mongoc_uri_set_appname (uri, value);
    } else {
-      mongoc_uri_bson_append_or_replace_key (&uri->options, option, value);
+      option_lowercase = lowercase_str_new (option);
+      mongoc_uri_bson_append_or_replace_key (
+         &uri->options, option_lowercase, value);
+      bson_free (option_lowercase);
    }
 
    return true;

src/libmongoc/tests/test-mongoc-uri.c

@@ -2720,6 +2720,21 @@ test_one_tls_option_enables_tls ()
    }
 }
 
+static void
+test_casing_options ()
+{
+   mongoc_uri_t* uri;
+   bson_error_t error;
+
+   uri = mongoc_uri_new("mongodb://localhost:27017/");
+   mongoc_uri_set_option_as_bool (uri, "TLS", true);
+   mongoc_uri_parse_options(uri, "ssl=false", false, &error);
+   ASSERT_ERROR_CONTAINS(error, MONGOC_ERROR_COMMAND, MONGOC_ERROR_COMMAND_INVALID_ARG,
+                          "conflicts");
+
+   mongoc_uri_destroy(uri);
+}
+
 void
 test_uri_install (TestSuite *suite)
 {
@@ -2753,4 +2768,5 @@ test_uri_install (TestSuite *suite)
    TestSuite_Add (suite,
                   "/Uri/one_tls_option_enables_tls",
                   test_one_tls_option_enables_tls);
+   TestSuite_Add(suite, "/Uri/options_casing", test_casing_options);
 }